check oneClickSwapEnabled

Author: piatoss3612

apps/extension/src/pages/ibc-swap/index.tsx

@@ -534,16 +534,20 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
   const isSwap = swapConfigs.amountConfig.type === "swap";
 
   /**
-   * One-click swap is disabled when:
-   * 1. Requires multiple transactions
-   * 2. Hardware wallet
-   * 3. EVM gas simulation outcome is APPROVAL_ONLY_SIMULATED (approve tx only simulated, not swap tx)
+   * One-click swap is enabled only when:
+   * 1. Single transaction (or erc20 approval + swap bundle with bundle tx simulation)
+   * 2. Not a hardware wallet
+   * 3. EVM gas simulation is not APPROVAL_ONLY_SIMULATED
    */
-  const oneClickSwapDisabled =
-    swapConfigs.amountConfig.requiresMultipleTxs ||
-    isHardwareWallet ||
-    gasSimulator.evmSimulationOutcome ===
-      EvmGasSimulationOutcome.APPROVAL_ONLY_SIMULATED;
+  const evmOutcome = gasSimulator.evmSimulationOutcome;
+  const oneClickSwapEnabled =
+    // single tx path
+    !swapConfigs.amountConfig.requiresMultipleTxs &&
+    // no hardware wallet
+    !isHardwareWallet &&
+    // wait until simulation result is available, and it must not be approval-only
+    evmOutcome != null &&
+    evmOutcome !== EvmGasSimulationOutcome.APPROVAL_ONLY_SIMULATED;
 
   const { showUSDNWarning, showCelestiaWarning } = getSwapWarnings(
     swapConfigs.amountConfig.currency,
@@ -1897,9 +1901,10 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
 
         <Gutter size="0.75rem" />
 
-        {oneClickSwapDisabled ? (
-          <Button
+        {oneClickSwapEnabled ? (
+          <HoldButton
             type="submit"
+            holdDurationMs={1500}
             disabled={
               interactionBlocked ||
               showUSDNWarning ||
@@ -1910,20 +1915,24 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
               shouldTopUp && remainingText
                 ? remainingText
                 : intl.formatMessage({
-                    id: "page.ibc-swap.title.swap",
+                    id: "page.ibc-swap.button.hold-to-approve",
                   })
             }
+            holdingText={intl.formatMessage({
+              id: "page.ibc-swap.button.keep-holding",
+            })}
             color="primary"
             size="large"
             isLoading={
               uiConfigStore.ibcSwapConfig.isSwapLoading ||
               accountStore.getAccount(inChainId).isSendingMsg === "ibc-swap"
             }
+            onHoldStart={() => setIsButtonHolding(true)}
+            onHoldEnd={() => setIsButtonHolding(false)}
           />
         ) : (
-          <HoldButton
+          <Button
             type="submit"
-            holdDurationMs={1500}
             disabled={
               interactionBlocked ||
               showUSDNWarning ||
@@ -1934,20 +1943,15 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
               shouldTopUp && remainingText
                 ? remainingText
                 : intl.formatMessage({
-                    id: "page.ibc-swap.button.hold-to-approve",
+                    id: "page.ibc-swap.title.swap",
                   })
             }
-            holdingText={intl.formatMessage({
-              id: "page.ibc-swap.button.keep-holding",
-            })}
             color="primary"
             size="large"
             isLoading={
               uiConfigStore.ibcSwapConfig.isSwapLoading ||
               accountStore.getAccount(inChainId).isSendingMsg === "ibc-swap"
             }
-            onHoldStart={() => setIsButtonHolding(true)}
-            onHoldEnd={() => setIsButtonHolding(false)}
           />
         )}