diff --git a/app/assets/scss/components/_token.scss b/app/assets/scss/components/_token.scss index 8cee10a..4e12c46 100644 --- a/app/assets/scss/components/_token.scss +++ b/app/assets/scss/components/_token.scss @@ -51,7 +51,7 @@ margin-left: 5px; } .apply-tomoz { - background: $background-violet; + background: $background-blue; @include fsz(14); // border-radius: 30px; padding: 2px 10px; diff --git a/app/assets/scss/settings/_colors.scss b/app/assets/scss/settings/_colors.scss index 1eca90e..5daaa33 100644 --- a/app/assets/scss/settings/_colors.scss +++ b/app/assets/scss/settings/_colors.scss @@ -39,8 +39,8 @@ $background-white: #ffffff; $background-oranges: #141414; $background-blue: #766B60; $background-blue-active: #766B60; -$background-violet: #5565c7; -$background-violet-active: #3D4DAC; +$background-violet: #766B60; +$background-violet-active: #766B60; $background-primary: #EBE9E5; diff --git a/app/components/Token.vue b/app/components/Token.vue index 351e73a..c3ba98e 100644 --- a/app/components/Token.vue +++ b/app/components/Token.vue @@ -59,7 +59,7 @@ v-if="(token.type === 'trc21' || token.type === 'vrc25') && !isAppliedZ && account === contractCreation" - :to="'/tomozcondition/' + address" + :to="'/viczcondition/' + address" class="tmp-btn-violet" style="width: 240px"> @@ -95,7 +95,7 @@ + :to="'/viczcondition/' + data.item.hash"> Apply to VICZ @@ -162,7 +162,7 @@ export default { return { listokenCurrentPage: this.$store.state.listokenCurrentPage || 1, listokenRows: 0, - listokenPerPage: 7, + listokenPerPage: 8, listokenFields: [ { key: 'logo', label: '', variant: 'sp-text-center' }, { key: 'token', label: 'Token' }, @@ -175,7 +175,7 @@ export default { { key: 'applytomoz', label: '', variant: 'sp-text-center' } ], listokenItems: [], - sortBy: 'totalSupplyNumber', + sortBy: 'price', sortDesc: true, tokens: [], loading: false, @@ -225,11 +225,12 @@ export default { symbol: i.symbol, hash: i.address, price: i.price ? i.price : '---', - totalSupply: i.totalSupplyNumber, + // totalSupply: this.formatNumber(i.totalSupplyNumber), ownerBalance: ownerBalanceStr + ownerValueStr, - supply: new BigNumber( + supply: this.formatNumber(new BigNumber( i.circulatingSupply ? i.circulatingSupply : i.totalSupply - ).div(10 ** i.decimals), + ).div(10 ** i.decimals) + ), holders: i.holder || '---', applytomoz: ((self.appliedZList || []).indexOf(i.address) > -1), applytomox: ((self.appliedXList || []).indexOf(i.address) > -1), diff --git a/app/components/applying/bridgeToken/ConfirmBridgeToken.vue b/app/components/applying/bridgeToken/ConfirmBridgeToken.vue index 7ac8d08..b324d03 100644 --- a/app/components/applying/bridgeToken/ConfirmBridgeToken.vue +++ b/app/components/applying/bridgeToken/ConfirmBridgeToken.vue @@ -93,7 +93,7 @@ class="btn tmp-btn-boder-violet btn-secondary">Token detail -

Zero Protocol Application

+

Zero Gas Protocol Application

-

TomoZ Protocol Application

+

Zero Gas Protocol Application

-

TomoZ Protocol Application

+

Zero Gas Protocol Application

@@ -54,7 +54,7 @@ - Apply to TomoZ protocol + Apply Zero Gas protocol