chore: Optimize if-else statements (#715)

* chore: Optimize if else statements * chore: update changeset * chore: update changeset
ant-design · Mar 27, 2024 · f4f80a7 · f4f80a7
1 parent afc22c9
commit f4f80a7
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 46 deletions.
diff --git a/.changeset/small-eyes-add.md b/.changeset/small-eyes-add.md
@@ -0,0 +1,7 @@
+---
+"@ant-design/web3-solana": patch
+"@ant-design/web3-wagmi": patch
+"@ant-design/web3": patch
+---
+
+chore: Optimize if-else statements
diff --git a/.dumi/theme/builtins/IconSearch/CopyableIcon.tsx b/.dumi/theme/builtins/IconSearch/CopyableIcon.tsx
@@ -36,9 +36,9 @@ const CopyableIcon: React.FC<CopyableIconProps> = ({
   const onCopy = (text: string, result: boolean) => {
     if (result) {
       onCopied(name, text);
-    } else {
-      message.error('Copy icon name failed, please try again.');
+      return;
     }
+    message.error('Copy icon name failed, please try again.');
   };
 
   return (

diff --git a/packages/solana/src/solana-provider/config-provider.tsx b/packages/solana/src/solana-provider/config-provider.tsx
@@ -98,12 +98,11 @@ export const AntDesignWeb3ConfigProvider: React.FC<
             name: c.name,
             icon: c.icon,
           };
-        } else {
-          console.error(
-            `Can not find chain ${item.id}, SolanaWeb3ConfigProvider only support Solana`,
-          );
-          return null;
         }
+        console.error(
+          `Can not find chain ${item.id}, SolanaWeb3ConfigProvider only support Solana`,
+        );
+        return null;
       })
       .filter((item) => item !== null) as (Chain & SolanaChainConfig)[];
   }, [props.availableChains, props.chainAssets]);

diff --git a/packages/wagmi/src/wagmi-provider/config-provider.tsx b/packages/wagmi/src/wagmi-provider/config-provider.tsx
@@ -153,12 +153,11 @@ export const AntDesignWeb3ConfigProvider: React.FC<AntDesignWeb3ConfigProviderPr
             name: c.name,
             icon: c.icon,
           };
-        } else {
-          console.error(
-            `Can not find chain ${item.id}, you should config it in WagmiWeb3ConfigProvider 'chains'.`,
-          );
-          return null;
         }
+        console.error(
+          `Can not find chain ${item.id}, you should config it in WagmiWeb3ConfigProvider 'chains'.`,
+        );
+        return null;
       })
       .filter((item) => item !== null) as Chain[];
   }, [availableChains, chainAssets]);
@@ -223,11 +222,11 @@ export const AntDesignWeb3ConfigProvider: React.FC<AntDesignWeb3ConfigProviderPr
         if (!chain) {
           // hava not connected any chain
           setCurrentChain(c);
-        } else {
-          switchChain?.({
-            chainId: c.id,
-          });
+          return;
         }
+        switchChain?.({
+          chainId: c.id,
+        });
       }}
       getNFTMetadata={async ({ address: contractAddress, tokenId }) =>
         getNFTMetadata(config, contractAddress, tokenId, chain?.id)

diff --git a/packages/web3/src/connect-modal/components/MainPanelHeader.tsx b/packages/web3/src/connect-modal/components/MainPanelHeader.tsx
@@ -14,12 +14,12 @@ const MainPanelHeader: React.FC<MainPanelHeaderProps> = (props) => {
   const { prefixCls, panelRouteBack, canBack } = useContext(connectModalContext);
 
   const handleBack = async () => {
-    if (onBack) {
-      const isBack = await onBack();
-      if (isBack !== false) {
-        panelRouteBack();
-      }
-    } else {
+    if (!onBack) {
+      panelRouteBack();
+      return;
+    }
+    const isBack = await onBack();
+    if (isBack !== false) {
       panelRouteBack();
     }
   };

diff --git a/packages/web3/src/connector/connector.tsx b/packages/web3/src/connector/connector.tsx
@@ -59,29 +59,29 @@ export const Connector: React.FC<ConnectorProps> = (props) => {
       {React.cloneElement(children as React.ReactElement<ConnectorTriggerProps>, {
         account,
         onConnectClick: async (wallet?: Wallet) => {
-          if (wallet) {
-            if (await wallet?.hasExtensionInstalled?.()) {
-              // call extension directly
-              connectWallet(wallet, {
-                connectType: 'extension',
-              });
-            } else {
-              // show qr code
-              if (actionRef.current?.selectWallet) {
-                // ConnectModal already mounted, call select
-                actionRef.current.selectWallet(wallet);
-              } else {
-                // ConnectModal not mounted, set defaultSelectWallet
-                connectWallet(wallet, {
-                  connectType: 'qrCode',
-                });
-                setDefaultSelectedWallet(wallet);
-              }
-              setOpen(true);
-            }
-          } else {
+          if (!wallet) {
             setOpen(true);
+            return;
+          }
+          if (await wallet?.hasExtensionInstalled?.()) {
+            // call extension directly
+            connectWallet(wallet, {
+              connectType: 'extension',
+            });
+            return;
+          }
+          // show qr code
+          if (actionRef.current?.selectWallet) {
+            // ConnectModal already mounted, call select
+            actionRef.current.selectWallet(wallet);
+          } else {
+            // ConnectModal not mounted, set defaultSelectWallet
+            connectWallet(wallet, {
+              connectType: 'qrCode',
+            });
+            setDefaultSelectedWallet(wallet);
           }
+          setOpen(true);
         },
         onDisconnectClick: () => {
           setLoading(true);

diff --git a/packages/web3/src/hooks/demos/useConnection.tsx b/packages/web3/src/hooks/demos/useConnection.tsx
@@ -11,10 +11,10 @@ const Demo: React.FC = () => {
         onClick={() => {
           if (account) {
             disconnect?.();
-          } else {
-            console.log('connect');
-            connect?.();
+            return;
           }
+          console.log('connect');
+          connect?.();
         }}
       >
         {account ? 'Disconnect' : 'Connect'}