From 432a6de5b51180a2d59e391d163d58101388a355 Mon Sep 17 00:00:00 2001 From: Bobo Date: Wed, 8 Jan 2025 14:32:04 +0100 Subject: [PATCH 1/2] Bridge page reorganization --- src/assets/img/astar_icon2.svg | 629 ++++++++++++++++++ .../assets/transfer/InputSelectAccount.vue | 2 +- src/components/bridge/BridgeSelection.vue | 116 ++-- src/i18n/en-US/index.ts | 5 + 4 files changed, 712 insertions(+), 40 deletions(-) create mode 100644 src/assets/img/astar_icon2.svg diff --git a/src/assets/img/astar_icon2.svg b/src/assets/img/astar_icon2.svg new file mode 100644 index 000000000..94b712a65 --- /dev/null +++ b/src/assets/img/astar_icon2.svg @@ -0,0 +1,629 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/assets/transfer/InputSelectAccount.vue b/src/components/assets/transfer/InputSelectAccount.vue index b6c214c25..dd46f25b2 100644 --- a/src/components/assets/transfer/InputSelectAccount.vue +++ b/src/components/assets/transfer/InputSelectAccount.vue @@ -20,7 +20,7 @@ class="input--address text--title" type="text" spellcheck="false" - placeholder="Destination Address" + :placeholder="$t('assets.transferPage.toPlaceholder')" @change="changeAddress" /> diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue index ecab93c8e..c5d8a01d4 100644 --- a/src/components/bridge/BridgeSelection.vue +++ b/src/components/bridge/BridgeSelection.vue @@ -41,6 +41,78 @@

+
+ +
+ +
+ +

+ {{ $t('bridge.celerBridge.warning') }} +

+
+ +
-
-
+
-
- -

- {{ $t('bridge.celerBridge.warning') }} -

-
@@ -208,6 +242,7 @@ import { buildCcipBridgePageLink, buildEthereumBridgePageLink, buildLzBridgePageLink, + buildTransferPageLink, } from 'src/router/routes'; import { navigateInNewTab } from 'src/util-general'; import { computed, defineComponent } from 'vue'; @@ -224,6 +259,7 @@ export default defineComponent({ isAstar, isH160, isShibuyaEvm, + nativeTokenSymbol, } = useNetworkInfo(); const l1Name = computed(() => { @@ -270,6 +306,8 @@ export default defineComponent({ buildLzBridgePageLink, navigateInNewTab, buildCcipBridgePageLink, + buildTransferPageLink, + nativeTokenSymbol, }; }, }); diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index 2440b1aeb..b90f7d3bb 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -561,6 +561,7 @@ export default { howToUsePortal: 'HOW TO USE THE PORTAL', xcmIsDisabled: 'XCM with {network} is temporarily disabled', xcmEvmIsDisabled: 'XCM to {network} via EVM wallets is temporarily disabled', + toPlaceholder: '0x...(EVM) or Astar Native addresses', }, modals: { max: 'Max', @@ -1108,6 +1109,10 @@ export default { tag: 'ETH', text: '3rd Party Bridge. Fast and reliable crypto transfers across networks to Astar zkEVM.', }, + astarEvmBridge: { + title: 'EVM Bridge', + text: 'Transfer assets between EVM and native networks.', + }, warning32blocks: 'It could take around 10~20mins or more to finalize', warningLzWithdrawal: 'It could take approximately 6 hours to finalize the bridge transaction from Astar zkEVM to Astar EVM', From fd7bc7b0cd4a631d7a34f45de7489bb27591f7c8 Mon Sep 17 00:00:00 2001 From: Bobo Date: Wed, 8 Jan 2025 21:01:33 +0100 Subject: [PATCH 2/2] Input placeholder color update --- src/css/text.scss | 2 +- src/i18n/en-US/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/css/text.scss b/src/css/text.scss index 4732d52af..37a9bd575 100644 --- a/src/css/text.scss +++ b/src/css/text.scss @@ -103,7 +103,7 @@ input[type='number'] { } input::placeholder { - color: $navy-3 !important; + color: $gray-4 !important; } .body--dark { diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index b90f7d3bb..248b78499 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -1111,7 +1111,7 @@ export default { }, astarEvmBridge: { title: 'EVM Bridge', - text: 'Transfer assets between EVM and native networks.', + text: 'Transfer assets between EVM and native network.', }, warning32blocks: 'It could take around 10~20mins or more to finalize', warningLzWithdrawal: