Merge branch 'dev'

nolus-protocol · Jul 3, 2024 · 02b752d · 02b752d
2 parents 52a2f55 + aab0cdc
commit 02b752d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/common/components/modals/receiveV2/ReceiveComponent.vue b/src/common/components/modals/receiveV2/ReceiveComponent.vue
@@ -85,7 +85,7 @@
                 src="@/assets/icons/metamask.svg"
                 class="mr-1"
               />
-              {{ evmAddress.length == 0 ? $t("message.connect") : evmAddress }}
+              {{ evmAddress == null || evmAddress?.length == 0 ? $t("message.connect") : evmAddress }}
             </button>
           </div>
           <div class="mt-[20px] block">

diff --git a/src/common/components/modals/sendV2/SendMainComponent.vue b/src/common/components/modals/sendV2/SendMainComponent.vue
@@ -92,7 +92,7 @@
                   src="@/assets/icons/metamask.svg"
                   class="mr-1"
                 />
-                {{ evmAddress.length == 0 ? $t("message.connect") : evmAddress }}
+                {{ evmAddress == null || evmAddress?.length == 0 ? $t("message.connect") : evmAddress }}
               </button>
             </div>
 
@@ -897,12 +897,10 @@ async function connectEvm() {
     evmAddress.value = client.shortAddress;
     wallet.value = client.address;
     await setEvmNetwork();
-  } catch (error: Error | any) {
+  } catch (error) {
     Logger.error(error);
-    amountErrorMsg.value = error.toString();
   } finally {
     isMetamaskLoading.value = false;
-    disablePicker.value = false;
   }
 }
 

diff --git a/src/config/global/networks.ts b/src/config/global/networks.ts
@@ -17,7 +17,7 @@ export const NETWORKS: { [key: string]: NetworkAddress } = {
     lppCreatedAt: 1686573237831,
     evmEndpoints: isDev()
       ? import("../networks/evm-endpoints?url").then((t) => t.default)
-      : "https://raw.githubusercontent.com/nolus-protocol/webapp/main/src/config/networks/evm-endpoints"
+      : "https://raw.githubusercontent.com/nolus-protocol/webapp/main/src/config/networks/evm-endpoints.json"
   },
   mainnet: {
     currencies: () => import("@nolus/nolusjs/build/utils/currencies_mainnet.json"),
@@ -33,7 +33,7 @@ export const NETWORKS: { [key: string]: NetworkAddress } = {
     lppCreatedAt: 1686845698269,
     evmEndpoints: isDev()
       ? import("../networks/evm-endpoints?url").then((t) => t.default)
-      : "https://raw.githubusercontent.com/nolus-protocol/webapp/main/src/config/networks/evm-endpoints"
+      : "https://raw.githubusercontent.com/nolus-protocol/webapp/main/src/config/networks/evm-endpoints.json"
   }
 };