update hooks to use prop conditional when fetching new output

helium · Oct 30, 2024 · 1fcdff1 · 1fcdff1
1 parent dcd9ec4
commit 1fcdff1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/ios/HeliumWallet.xcodeproj/project.pbxproj b/ios/HeliumWallet.xcodeproj/project.pbxproj
@@ -1079,7 +1079,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.10.0;
+				MARKETING_VERSION = 2.10.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1117,7 +1117,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.10.0;
+				MARKETING_VERSION = 2.10.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1303,7 +1303,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.10.0;
+				MARKETING_VERSION = 2.10.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1348,7 +1348,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.10.0;
+				MARKETING_VERSION = 2.10.1;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.helium.wallet.app.OneSignalNotificationServiceExtension;
@@ -1396,7 +1396,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.10.0;
+				MARKETING_VERSION = 2.10.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1445,7 +1445,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.10.0;
+				MARKETING_VERSION = 2.10.1;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.helium.wallet.app.HeliumWalletWidget;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "helium-wallet",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "private": true,
   "scripts": {
     "postinstall": "patch-package && ./node_modules/.bin/rn-nodeify --hack --install && npx jetify",

diff --git a/src/features/swaps/SwapScreen.tsx b/src/features/swaps/SwapScreen.tsx
@@ -478,32 +478,43 @@ const SwapScreen = () => {
     ],
   )
 
+  useEffect(() => {
+    setRecipient('')
+    setRecipientOpen(false)
+    setOutputAmount(0)
+  }, [
+    inputMint,
+    inputAmount,
+    outputMint,
+    setRecipient,
+    setRecipientOpen,
+    setOutputAmount,
+  ])
+
   useEffect(() => {
     // if changing outputMint ensure we get new routes
     ;(async () => {
       if (
         !isDevnet &&
-        inputMintAcc &&
-        outputMintAcc &&
+        inputMintAcc?.address === inputMint &&
+        outputMintAcc?.address === outputMint &&
         typeof inputAmount !== 'undefined' &&
         inputAmount > 0 &&
         !outputMintAcc?.address.equals(DC_MINT)
       ) {
-        setRecipient('')
-        setRecipientOpen(false)
         await getOutputAmount({
           balance: toBN(inputAmount || 0, inputMintAcc.decimals),
         })
       }
     })()
   }, [
     getOutputAmount,
+    inputMint,
     inputAmount,
     inputMintAcc,
+    outputMint,
     outputMintAcc,
     isDevnet,
-    setRecipient,
-    setRecipientOpen,
   ])
 
   const getInputAmount = useCallback(