Merge pull request #317 from axelarnetwork/develop

0.4.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "axelar-satellite",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/components/common/ConnectIndicator.tsx

@@ -1,12 +1,15 @@
 import React from "react";
 import Image from "next/image";
+import { pick } from "rambda";
 
 import { useWalletStore } from "~/store";
 
 import { useIsTerraConnected } from "~/hooks/terra/useIsTerraConnected";
 
 export const ConnectIndicator = () => {
-  const { wagmiConnected, keplrConnected, wagmiConnectorId } = useWalletStore();
+  const { wagmiConnected, keplrConnected, wagmiConnectorId } = useWalletStore(
+    pick(["wagmiConnected", "keplrConnected", "wagmiConnectorId"])
+  );
   const { isTerraConnected } = useIsTerraConnected();
 
   return (
@@ -27,7 +30,9 @@ export const ConnectIndicator = () => {
           <Image
             height={25}
             width={25}
-            src={`/assets/wallets/${wagmiConnectorId?.toLowerCase()}.logo.svg`}
+            src={`/assets/wallets/${
+              wagmiConnectorId?.toLowerCase() ?? "metamask"
+            }.logo.svg`}
             alt={`${wagmiConnectorId} Logo`}
           />
         )}

src/store/stores/swap-store/index.ts

@@ -132,25 +132,20 @@ export const useSwapStore = create<SwapStore>()(
         false,
         "setDestAddress"
       ),
-    setAsset: (_asset) => {
+    setAsset: (asset) => {
       const { allAssets, destChain } = get();
-      let asset = _asset;
 
-      if (
-        _asset &&
-        _asset.gas_token_id &&
-        destChain.chainName.toLowerCase() === _asset.native_chain
-      ) {
-        const nativeAsset = allAssets.find((t) => t.id === _asset.gas_token_id);
+      const shouldUseNativeAsset =
+        asset?.gas_token_id &&
+        destChain.chainName.toLowerCase() === asset.native_chain;
 
-        if (nativeAsset) {
-          asset = nativeAsset;
-        }
-      }
+      const nativeAsset = shouldUseNativeAsset
+        ? allAssets.find((t) => t.id === asset.gas_token_id)
+        : undefined;
 
       set(
         {
-          asset,
+          asset: nativeAsset ?? asset,
         },
         false,
         "setAsset"

src/store/stores/wallet-store/index.ts

@@ -23,7 +23,7 @@ export const useWalletStore = create<WalletStore>()(
   persist(
     (set, _get) => ({
       ...initialWalletState,
-      setWagmiConnected: (wagmiConnected, connectorId) =>
+      setWagmiConnected: (wagmiConnected, connectorId = "metaMask") =>
         set({
           wagmiConnected,
           wagmiConnectorId: connectorId,