Merge branch 'develop' into feature/swap-layout

sora-xor · Apr 5, 2024 · 2361d92 · 2361d92
2 parents 2324909 + 959554b
commit 2361d92
Show file tree

Hide file tree

Showing 22 changed files with 239 additions and 242 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -379,13 +379,13 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
           onReconnect: this.handleNodeConnect,
         }),
       ]);
-
+    } catch (error) {
+      // we handled error using callback, do nothing
+    } finally {
       // Wallet node connection dependent logic
       if (!this.isWalletLoaded) {
         await initWallet(walletOptions);
       }
-    } catch (error) {
-      // we handled error using callback, do nothing
     }
   }
 }

diff --git a/src/assets/img/networks/avalanche.svg b/src/assets/img/networks/avalanche.svg
diff --git a/src/assets/img/networks/binance-smart-chain.svg b/src/assets/img/networks/binance-smart-chain.svg
diff --git a/src/assets/img/networks/ethereum-classic.svg b/src/assets/img/networks/ethereum-classic.svg
diff --git a/src/assets/img/networks/ethereum.svg b/src/assets/img/networks/ethereum.svg
diff --git a/src/assets/img/networks/karura.svg b/src/assets/img/networks/karura.svg
diff --git a/src/assets/img/networks/klaytn.svg b/src/assets/img/networks/klaytn.svg
diff --git a/src/assets/img/networks/kusama.svg b/src/assets/img/networks/kusama.svg