Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump browserify-sign from 4.2.1 to 4.2.2 #798

Merged
merged 13 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "open-block-explorer",
"version": "1.2.6",
"version": "1.2.7",
"description": "..",
"productName": "Telos Block Explorer",
"author": "DonaldPeat <[email protected]>",
Expand Down
9 changes: 8 additions & 1 deletion src/components/AccountCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,13 @@ export default defineComponent({
},
);

watch(
() => store.resources.getDelegatedToOthersAggregated(),
() => {
setTotalBalance();
},
);

return {
accountPageSettings,
netUnit,
Expand Down Expand Up @@ -680,7 +687,7 @@ $medium:750px

.q-table__card
background: unset
color: rgba(255, 255, 255, 0.5)
color: rgba(255, 255, 255, 0.8)

.q-table--horizontal-separator
thead th
Expand Down
23 changes: 19 additions & 4 deletions src/components/LoginHandlerDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,14 @@ export default defineComponent({
:content-style="{ backgroundColor: '#172c6c' }"
>
<q-card class="buttons-container">
<q-card-section>
<div class="row">
<div class="col-12"><a class="text-white hover-dec" :href=" '/account/' + account">{{account}}</a></div>
</div>
<q-card-section class="account-link">
<a class="text-white" :href=" '/account/' + account">
<div class="row">
<div class="col-12">
View my account
</div>
</div>
</a>
</q-card-section>
<q-separator dark/>
<q-card-section>
Expand Down Expand Up @@ -89,6 +93,17 @@ export default defineComponent({
width: fit-content
height: 40px
text-transform: lowercase

.account-link
&:hover
cursor: pointer
transition: background-color .3s
background-color: color-mix(in oklab, var(--q-secondary) 88%, white 12%)
a
text-decoration: none
div
width: fit-content
margin-left: .25rem
.buttons-container
width: 220px
max-width: 80vw
Expand Down
2 changes: 1 addition & 1 deletion src/components/PriceChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default defineComponent({
chartOptions.value.series[0].data = data.prices;
};
const formatPercentage = (val: number): string => `${val.toFixed(2)} %`;
const formatCurrencyValue = (val: number): string => val < ONE_MILLION
const formatCurrencyValue = (val: number): string => val < 1 ? `$${val.toFixed(3)}` : val < ONE_MILLION
? `$${val.toFixed(2)}`
: val < ONE_BILLION
? `$${(val / ONE_MILLION).toFixed(2)}M`
Expand Down
12 changes: 8 additions & 4 deletions src/components/transaction/DataFormat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export default defineComponent({
const transferData = computed(() => actionData.value as TransferData);
const clientHeight = computed(() => dataBox.value?.clientHeight ?? 0);
let currentData = ref<string | unknown>(null);
const maxHeight = 98; // the maximum row height
const switchHeight = 20;
const maxHeight = 110; // the maximum row height
const switchHeight = 40;
const maxHeightStyle = `calc(${maxHeight}px - ${switchHeight}px)`;

function compareJsonObjects(obj1: unknown, obj2: unknown): boolean {
Expand Down Expand Up @@ -108,10 +108,10 @@ export default defineComponent({

<template>
<div
class="relative-position"
class="relative-position overflow-hidden"
:class="{'div-compressed': !showOverflow}"
>
<div v-if="actionName === 'transfer'" ref="dataBox" class="row">
<div v-if="actionName === 'transfer'" ref="dataBox" class="row transfer-data">
<div class="col-12">
<span class="text-bold">
<AccountFormat :account="transferData.from" type="account"/></span><span class="text-bold">&nbsp; → &nbsp;
Expand Down Expand Up @@ -156,6 +156,10 @@ export default defineComponent({
flex-direction: column
gap: 5px
word-break: break-all
min-height: 70px

.transfer-data
text-wrap: wrap

.div-compressed
max-height: v-bind(maxHeightStyle)
Expand Down
2 changes: 1 addition & 1 deletion src/components/transaction/TransactionCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default defineComponent({
<div class="col-xs-12 col-sm-6">
<div class="text-body1 text-weight-medium text-uppercase">Block time</div>
</div>
<div class="col-xs-12 col-sm-6 text-right text-bold">{{formatDate(timestamp)}}</div>
<div class="col-xs-12 col-sm-6 text-right text-bold">{{formatDate(`${timestamp}Z`)}}</div>
</div>
</q-card-section>
<q-separator class="card-separator" inset="inset"/>
Expand Down
Loading
Loading