Fix infinite loading state when onboarding a hotspot with valid linke…

…d transaction. (#540) * Fix infinite loading state when onboarding a hotspot with valid linked transaction. * Bump version to 2.4.2
helium · Nov 15, 2023 · 3061896 · 3061896
1 parent 50ba269
commit 3061896
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/ios/HeliumWallet.xcodeproj/project.pbxproj b/ios/HeliumWallet.xcodeproj/project.pbxproj
@@ -997,7 +997,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1035,7 +1035,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1203,7 +1203,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1248,7 +1248,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.helium.wallet.app.OneSignalNotificationServiceExtension;
@@ -1296,7 +1296,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1345,7 +1345,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.2;
 				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.4.1",
+  "version": "2.4.2",
   "private": true,
   "scripts": {
     "postinstall": "patch-package && ./node_modules/.bin/rn-nodeify --hack --install && npx jetify",
@@ -324,4 +324,4 @@
     "vm": "vm-browserify",
     "zlib": "browserify-zlib"
   }
-}
+}
diff --git a/src/features/txnDelegation/useSolTxns.ts b/src/features/txnDelegation/useSolTxns.ts
@@ -109,17 +109,26 @@ const useSolTxns = (heliumAddress: string, solanaTransactions?: string) => {
         return {}
       }
 
-      const bs58Decoded = bs58.decode(
-        (last(instructions) as web3.PartiallyDecodedInstruction).data,
-      )
-      const decodedBs58Instruction = coder.decode(Buffer.from(bs58Decoded))
-      if (!decodedBs58Instruction) {
-        return {}
-      }
+      let gatewayAddress = ''
+      instructions.some((i) => {
+        try {
+          const bs58Decoded = bs58.decode(
+            (i as web3.PartiallyDecodedInstruction).data,
+          )
+
+          const decodedBs58Instruction = coder.decode(Buffer.from(bs58Decoded))
+          if (!decodedBs58Instruction) {
+            return false
+          }
 
-      const entityKey = get(decodedBs58Instruction, 'data.args.entityKey')
+          const entityKey = get(decodedBs58Instruction, 'data.args.entityKey')
 
-      const gatewayAddress = bs58.encode(entityKey)
+          gatewayAddress = bs58.encode(entityKey)
+          return !!gatewayAddress
+        } catch {
+          return false
+        }
+      })
 
       const { location, elevation, gain } = get(
         decodedInstruction,
@@ -365,8 +374,9 @@ const useSolTxns = (heliumAddress: string, solanaTransactions?: string) => {
   )
 
   useAsync(async () => {
-    if (!solanaTransactions || handledTxnStr.current === solanaTransactions)
+    if (!solanaTransactions || handledTxnStr.current === solanaTransactions) {
       return
+    }
 
     const txns = solanaTransactions
       .split(',')