From ca1b5a87df3932e9ed44f82e12bb47bb542d32b5 Mon Sep 17 00:00:00 2001 From: ztepler Date: Thu, 21 Nov 2024 19:03:41 +0000 Subject: [PATCH 1/7] updated variables for the mainnet --- .env | 15 ++++--- src/services/cfg/tokens.js | 84 +------------------------------------- 2 files changed, 8 insertions(+), 91 deletions(-) diff --git a/.env b/.env index 8f47186..0046887 100644 --- a/.env +++ b/.env @@ -1,9 +1,8 @@ -VITE_TEZOS_NETWORK_NAME = 'ghostnet' -VITE_SMART_ROLLUP_ADDRESS = 'sr18wx6ezkeRjt1SZSeZ2UQzQN3Uc3YLMLqg' -VITE_SMART_ROLLUP_NODE_URL = 'http://34.65.5.184:8932' -VITE_ETHERLINK_RPC = 'https://node.ghostnet.etherlink.com' -VITE_ETHERLINK_CHAIN_ID = 128123 -VITE_ETHERLINK_EXPLORER = 'https://testnet.explorer.etherlink.com' -VITE_SDK_URL = 'https://etherlink-bridge-ghostnet.dipdup.net' -VITE_SDK_WSS = 'wss://etherlink-bridge-ghostnet.dipdup.net' +VITE_TEZOS_NETWORK_NAME = 'mainnet' +VITE_SMART_ROLLUP_ADDRESS = 'sr1Ghq66tYK9y3r8CC1Tf8i8m5nxh8nTvZEf' +VITE_ETHERLINK_RPC = 'https://node.mainnet.etherlink.com' +VITE_ETHERLINK_CHAIN_ID = 42793 +VITE_ETHERLINK_EXPLORER = 'https://explorer.etherlink.com' +VITE_SDK_URL = 'https://bridge.indexer.etherlink.com' +VITE_SDK_WSS = 'wss://bridge.indexer.etherlink.com' VITE_WALLET_CONNECT_PROJECT_ID = 734c08921b9f4f202d6b63a45fb0d800 diff --git a/src/services/cfg/tokens.js b/src/services/cfg/tokens.js index 91e865d..a0f12d9 100644 --- a/src/services/cfg/tokens.js +++ b/src/services/cfg/tokens.js @@ -7,7 +7,7 @@ export const tokenPairs = [ ticker: "XTZ", decimals: 6, icon: "xtz", - ticketHelperContractAddress: "KT1VEjeQfDBSfpDH5WeBM5LukHPGM2htYEh3", + ticketHelperContractAddress: "KT1Wj8SUGmnEPFqyahHAcjcNQwe6YGhEXJb5", }, etherlink: { type: "native", @@ -17,88 +17,6 @@ export const tokenPairs = [ decimals: 18, icon: "xtz", }, - }, - { - tezos: { - type: "fa1.2", - name: "tzBTC", - ticker: "tzBTC", - address: "KT1HmyazXfKDbo8XjwtWPXcoyHcmNPDCvZyb", - decimals: 8, - icon: "tzbtc", - ticketerContractAddress: "KT1H7if3gSZE1pZSK48W3NzGpKmbWyBxWDHe", - ticketHelperContractAddress: "KT1KUAaaRMeMS5TJJyGTQJANcpSR4egvHBUk", - }, - etherlink: { - type: "erc20", - name: "tzBTC", - ticker: "tzBTC", - address: "0x8e73aE3CF688Fbd8368c99520d26F9eF1B4d3BCa", - decimals: 8, - icon: "tzbtc", - }, - }, - { - tezos: { - type: "fa1.2", - name: "Sirius", - ticker: "SIRS", - address: "KT1TCTpXXbpnWBZ8whqExokbKfUrUW3nAXDJ", - decimals: 0, - icon: "sirs", - ticketerContractAddress: "KT1Cw8WZLp4XUPLrDWUjwwpShzCRqzRByyVh", - ticketHelperContractAddress: "KT1DSy9C2dBRDYPCHuBVaYYDQPjhprcSA9eL", - }, - etherlink: { - type: "erc20", - name: "Sirius", - ticker: "SIRS", - address: "0xbaA233e2f62f45e9D91Dacd3D6C6A57Bc2CBc575", - decimals: 0, - icon: "sirs", - }, - }, - { - tezos: { - type: "fa2", - name: "Tether USD", - ticker: "USDt", - address: "KT1V2ak1MfNd3w4oyKD64ehYU7K4CrpUcDGR", - tokenId: "0", - decimals: 6, - icon: "usdt", - ticketerContractAddress: "KT1S6Nf9MnafAgSUWLKcsySPNFLUxxqSkQCw", - ticketHelperContractAddress: "KT1JLZe4qTa76y6Us2aDoRNUgZyssSDUr6F5", - }, - etherlink: { - type: "erc20", - name: "Tether USD", - ticker: "USDt", - address: "0xf68997eCC03751cb99B5B36712B213f11342452b", - decimals: 6, - icon: "usdt", - }, - }, - { - tezos: { - type: "fa2", - name: "youves YOU Governance", - ticker: "YOU", - address: "KT1VyYTej9iHeAfpCKBEdpqiKaHAk4hUN7h8", - tokenId: "0", - decimals: 12, - icon: "you", - ticketerContractAddress: "KT1DjH84P98gKFptqiAevj1qoKqxrTaG1T7i", - ticketHelperContractAddress: "KT1HV4o5WnnJ6QEPWqck9Lk3vQakcUD89qc8", - }, - etherlink: { - type: "erc20", - name: "YOU", - ticker: "YOU", - address: "0x59118D19848bAca5C3Dd1603acfC99C4cbcCC3db", - decimals: 12, - icon: "you", - }, } ] From 2fc45514532784bddf7c7a1bfab49c76052bd90f Mon Sep 17 00:00:00 2001 From: ztepler Date: Thu, 21 Nov 2024 19:37:06 +0000 Subject: [PATCH 2/7] removed Testnet from the Etherlink network name --- src/services/cfg/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/cfg/index.js b/src/services/cfg/index.js index d912dfb..ba4bbe7 100644 --- a/src/services/cfg/index.js +++ b/src/services/cfg/index.js @@ -25,8 +25,8 @@ export const config = { }, etherlink: { network: { - name: "Etherlink Testnet", - displayName: "Etherlink Testnet", + name: "Etherlink", + displayName: "Etherlink", chainId: Number(import.meta.env.VITE_ETHERLINK_CHAIN_ID), nativeCurrency: { name: "XTZ", From 07c9d67716a58714e801339680428be1a59a66ef Mon Sep 17 00:00:00 2001 From: ztepler Date: Thu, 21 Nov 2024 20:27:17 +0000 Subject: [PATCH 3/7] TokenSelector: Disable dropdown if no other tokens --- src/components/TokenSelector.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/TokenSelector.vue b/src/components/TokenSelector.vue index 1a3d78e..b4fefa1 100644 --- a/src/components/TokenSelector.vue +++ b/src/components/TokenSelector.vue @@ -66,10 +66,11 @@ const dropdownItems = computed(() => { } }) +const hasDropdownItems = computed(() => dropdownItems.value.length > 0) \ No newline at end of file diff --git a/src/components/TransferItem.vue b/src/components/TransferItem.vue index 707fa0c..bd2ac0f 100644 --- a/src/components/TransferItem.vue +++ b/src/components/TransferItem.vue @@ -92,7 +92,7 @@ const statusStyle = computed(() => { return {color: `var(--red)`} } - return {color: `var(--green)`, opacity: 0.8} + return {color: `var(--etherlink-green)`, opacity: 0.8} } return {color: `var(--blue)`} @@ -199,7 +199,7 @@ const handleRemove = () => { Processing.. - + Finish withdrawal @@ -233,7 +233,7 @@ const handleRemove = () => { } .img { - border-radius: 50%; + border-radius: 50%; } .icon_close{ @@ -257,7 +257,7 @@ const handleRemove = () => { height: 32px; border-radius: 8px; - background: var(--green); + background: var(--etherlink-green); opacity: 0.85; cursor: pointer; diff --git a/src/components/TransferWidget.vue b/src/components/TransferWidget.vue index b32b13e..c9eb7ab 100644 --- a/src/components/TransferWidget.vue +++ b/src/components/TransferWidget.vue @@ -294,7 +294,7 @@ const warningDisplayed = ref(true) - + Recent transfers @@ -466,7 +466,7 @@ const warningDisplayed = ref(true) height: 32px; border-radius: 8px; - background: var(--green); + background: var(--etherlink-green); opacity: 0.85; cursor: pointer; @@ -495,7 +495,7 @@ const warningDisplayed = ref(true) } .connect_wallets { - background: var(--yellow); + background: var(--etherlink-green); } .transfers_header { diff --git a/src/components/ui/Stepper.vue b/src/components/ui/Stepper.vue index c44d660..0c23d30 100644 --- a/src/components/ui/Stepper.vue +++ b/src/components/ui/Stepper.vue @@ -122,7 +122,7 @@ onMounted(() => { } .passed { - background-color: var(--green); + background-color: var(--etherlink-green); animation: none; } From 455351e25ccdb4a73f951dcd60fce8506107f889 Mon Sep 17 00:00:00 2001 From: Devon Date: Tue, 26 Nov 2024 18:23:25 +0400 Subject: [PATCH 6/7] feat: change width + display wallets --- src/components/ConnectWidget.vue | 4 ++-- src/components/TransferWidget.vue | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/components/ConnectWidget.vue b/src/components/ConnectWidget.vue index 5e49f6e..4f4f315 100644 --- a/src/components/ConnectWidget.vue +++ b/src/components/ConnectWidget.vue @@ -197,8 +197,8 @@ const {