fix: code review

bob-collective · Dec 20, 2024 · 2cb6b7f · 2cb6b7f
1 parent 71af52e
commit 2cb6b7f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/apps/evm/src/app/[lang]/(bridge)/bridge/Bridge.tsx b/apps/evm/src/app/[lang]/(bridge)/bridge/Bridge.tsx
@@ -81,6 +81,8 @@ const Bridge = ({ searchParams }: Props) => {
   const [bridgeOrigin, setBridgeOrigin] = useState<BridgeOrigin>(getOrigin(type, chain, symbol));
 
   const handleChangeTab = (key: Key) => {
+    if (type === key.toString()) return;
+
     const newChain = L1_CHAIN;
 
     setChain(newChain);
@@ -117,9 +119,7 @@ const Bridge = ({ searchParams }: Props) => {
     router.replace('?' + urlSearchParams);
   }, [type, chain, router, symbol, urlSearchParams]);
 
-  const isBobBridgeDisabled =
-    (direction === TransactionDirection.L1_TO_L2 && chain !== L1_CHAIN && chain !== 'BTC') ||
-    (direction === TransactionDirection.L2_TO_L1 && chain !== L1_CHAIN);
+  const isBobBridgeDisabled = !(chain === L1_CHAIN || chain === L2_CHAIN || chain === 'BTC');
 
   const isExternalBridgeDisabled = chain === 'BTC' || !!(symbol && externalUnsupportedTokens.includes(symbol));
 
@@ -146,7 +146,7 @@ const Bridge = ({ searchParams }: Props) => {
               title={<Trans>Withdraw</Trans>}
               tooltipProps={{
                 isDisabled: !isWithdrawTabDisabled,
-                label: <Trans>Withdraws back to BTC are currently not supported</Trans>
+                label: <Trans>Withdrawals back to BTC are currently not supported</Trans>
               }}
             >
               <></>

diff --git a/apps/evm/src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx b/apps/evm/src/app/[lang]/(bridge)/bridge/components/BridgeForm/BobBridgeForm.tsx
@@ -137,7 +137,7 @@ const BobBridgeForm = ({
   const handleSuccess = (data: BridgeTransaction) => {
     onBridgeSuccess?.(data);
 
-    // Reseting form and defaulting ETH
+    // Resetting form and defaulting ETH
     form.resetForm({ values: { ...initialValues, [BRIDGE_ASSET]: initialToken.symbol } });
 
     onChangeSymbol?.(initialToken.symbol);

diff --git a/apps/evm/src/locales/en.po b/apps/evm/src/locales/en.po
@@ -2091,8 +2091,12 @@ msgid "Withdraw to L1 failed. Please try again."
 msgstr "Withdraw to L1 failed. Please try again."
 
 #: src/app/[lang]/(bridge)/bridge/Bridge.tsx:149
-msgid "Withdraws back to BTC are currently not supported"
-msgstr "Withdraws back to BTC are currently not supported"
+msgid "Withdrawals back to BTC are currently not supported"
+msgstr "Withdrawals back to BTC are currently not supported"
+
+#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:149
+#~ msgid "Withdraws back to BTC are currently not supported"
+#~ msgstr "Withdraws back to BTC are currently not supported"
 
 #: src/app/[lang]/fusion/components/UserInfo/MultipliersModal.tsx:209
 msgid "Yield Assets"

diff --git a/apps/evm/src/locales/zh.po b/apps/evm/src/locales/zh.po
@@ -2078,9 +2078,13 @@ msgid "Withdraw to L1 failed. Please try again."
 msgstr ""
 
 #: src/app/[lang]/(bridge)/bridge/Bridge.tsx:149
-msgid "Withdraws back to BTC are currently not supported"
+msgid "Withdrawals back to BTC are currently not supported"
 msgstr ""
 
+#: src/app/[lang]/(bridge)/bridge/Bridge.tsx:149
+#~ msgid "Withdraws back to BTC are currently not supported"
+#~ msgstr ""
+
 #: src/app/[lang]/fusion/components/UserInfo/MultipliersModal.tsx:209
 msgid "Yield Assets"
 msgstr "收益资产"