Upgrade to anchor 31

ios/Podfile.lock

@@ -90,7 +90,7 @@ PODS:
   - FBLazyVector (0.74.5)
   - fmt (9.1.0)
   - glog (0.3.5)
-  - helium-react-native-sdk (3.0.5):
+  - helium-react-native-sdk (3.1.0):
     - React-Core
   - hermes-engine (0.74.5):
     - hermes-engine/Pre-built (= 0.74.5)
@@ -1864,122 +1864,122 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BCrypt: 712b656110e5020d319c547e4d8f3053ded82b2a
-  bcrypt-react-native: 5e42aa70cad6f92b886cfb0c991cca9b0d343a17
+  bcrypt-react-native: 399775585257ae6c8717370a1119c7da0113e3bf
   BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
-  BVLinearGradient: 7815a70ab485b7b155186dd0cc836363e0288cad
+  BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
   Charts: ce0768268078eee0336f122c3c4ca248e4e204c5
   DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
-  EXBarCodeScanner: 6415603150dd5989a139570bb5af19b7f169fe49
-  EXConstants: 89d35611505a8ce02550e64e43cd05565da35f9a
-  EXImageLoader: 1fe96c70cdc78bedc985ec4b1fab5dd8e67dc38b
-  Expo: 128dd477ad3842d63465ce2be58b26e60f364306
-  ExpoAsset: 286fee7ba711ce66bf20b315e68106b13b8629fc
-  ExpoCamera: 5d394b72459c2e20d01d99f8e1e4374c457040b0
-  ExpoFileSystem: 2988caaf68b7cb706e36d382829d99811d9d76a5
-  ExpoFont: 6e74aa0e887fdddac2fc745ecfadce67aaebaae8
-  ExpoHaptics: 9f47be324f691b6291c17c216189ab832d1a4d69
-  ExpoKeepAwake: dd02e65d49f1cfd9194640028ae2857e536eb1c9
-  ExpoLocalAuthentication: b94db59f55df95350223200c746b4ddf0cb7cfc0
-  ExpoModulesCore: cad1227f619a67c82c52e0e71fc70514cd93def8
-  ExpoSecureStore: 6506992a9f53c94ea716c54d4a63144965945c2c
-  EXSplashScreen: a3c60ed8e3d145d7bf795c9907d6f011e3e8438b
+  EXBarCodeScanner: e2dd9b42c1b522a2adc9202b1dfbc64cb34456d1
+  EXConstants: 409690fbfd5afea964e5e9d6c4eb2c2b59222c59
+  EXImageLoader: ab589d67d6c5f2c33572afea9917304418566334
+  Expo: 798848eae1daf13363d69790986146b08d0cf92f
+  ExpoAsset: 323700f291684f110fb55f0d4022a3362ea9f875
+  ExpoCamera: a5d000b22cd7dfd2c5904ed960e549de42c96da0
+  ExpoFileSystem: 80bfe850b1f9922c16905822ecbf97acd711dc51
+  ExpoFont: e7f2275c10ca8573c991e007329ad6bf98086485
+  ExpoHaptics: 5a3a88971af384255baf2504f38b41189cec6984
+  ExpoKeepAwake: 3b8815d9dd1d419ee474df004021c69fdd316d08
+  ExpoLocalAuthentication: 9e02a56a4cf9868f0052656a93d4c94101a42ed7
+  ExpoModulesCore: 5440e96a8ee014f4fd88e77264985fd0a65f5f8c
+  ExpoSecureStore: 060cebcb956b80ddae09821610ac1aa9e1ac74cd
+  EXSplashScreen: fbf0ec78e9cee911df188bf17b4fe51d15a84b87
   FBLazyVector: ac12dc084d1c8ec4cc4d7b3cf1b0ebda6dab85af
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
   glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
-  helium-react-native-sdk: ceaa5a4bfafe1ad862bbb3ab79cc5fb6f7a855cc
+  helium-react-native-sdk: 47665fe5a5909844706d5f4da8fc516c7cfdba1e
   hermes-engine: 8c1577f3fdb849cbe7729c2e7b5abc4b845e88f8
   lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494
-  lottie-react-native: f26bf46e376a20620da39b1e74d9f0972bfeb0e8
-  maplibre-react-native: 275e81319b9d75e120902a09f4ca07cce9537234
+  lottie-react-native: f851c0e235f171d99083c803f728f644be1dcf65
+  maplibre-react-native: 86193b158673e028ce10f4f3533e472ce8dbb7b2
   MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
   OneSignalXCFramework: f06edd9b146c7ac5935136a117ce2a5fdd6420f6
-  RCT-Folly: 5dc73daec3476616d19e8a53f0156176f7b55461
+  RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
   RCTDeprecation: 3afceddffa65aee666dafd6f0116f1d975db1584
   RCTRequired: ec1239bc9d8bf63e10fb92bd8b26171a9258e0c1
   RCTTypeSafety: f5ecbc86c5c5fa163c05acb7a1c5012e15b5f994
   React: fc9fa7258eff606f44d58c5b233a82dc9cf09018
   React-callinvoker: e3fab14d69607fb7e8e3a57e5a415aed863d3599
-  React-Codegen: 3963186cb6a4ef21b5e67dcf7badf359867ff6df
-  React-Core: c3f589f104983dec3c3eeec5e70d61aa811bc236
-  React-CoreModules: 864932ddae3ead5af5bfb05f9bbc2cedcb958b39
-  React-cxxreact: bd9146108c44e6dbb99bba4568ce7af0304a2419
+  React-Codegen: 6fa87b7c6b8efcd0cef4bfeaec8c8bc8a6abe75a
+  React-Core: 3a5fd9e781cecf87803e5b091496a606a3df774a
+  React-CoreModules: cbf4707dafab8f9f826ac0c63a07d0bf5d01e256
+  React-cxxreact: 7b188556271e3c7fdf22a04819f6a6225045b9dd
   React-debug: d30893c49ae1bce4037ea5cd8bb2511d2a38d057
-  React-Fabric: a171830e52baf8ec2b175c6a3791e01bbb92f1fb
-  React-FabricImage: ad154af0067f4b5dc5a41f607e48ee343641e903
+  React-Fabric: 826729dd2304fda9b89ff0a579f60ba2a470bc26
+  React-FabricImage: 2ad1fb8ffa5778eda9ed204a7b3cdd70bc333ce7
   React-featureflags: 4ae83e72d9a92452793601ac9ac7d2280e486089
-  React-graphics: ed7d57965140168de86835946e8f1210c72c65dc
-  React-hermes: 177b1efdf3b8f10f4ca12b624b83fb4d4ccb2884
-  React-ImageManager: 3a50d0ee0bf81b1a6f23a0c5b30388293bcd6004
-  React-jserrorhandler: dcd62f5ca1c724c19637595ef7f45b78018e758f
-  React-jsi: 0abe1b0881b67caf8d8df6a57778dd0d3bb9d9a5
-  React-jsiexecutor: f6ca8c04f19f6a3acaa9610f7fb728f39d6e3248
-  React-jsinspector: db98771eae84e6f86f0ca5d9dcc572baadbfefc0
-  React-jsitracing: f8367edacc50bb3f9f056a5aeafb8cee5849fafb
-  React-logger: 780b9ee9cec7d44eabc4093de90107c379078cb6
-  React-Mapbuffer: f544f00b98dbdd8cbae96dd2bdb8b47f719976e0
-  react-native-ble-plx: 2dd8780ee8d34c60399aaa897249ed1860ebef10
-  react-native-blur: 114b6004aa3862274fdf0e322afdd80947459b0e
-  react-native-charts-wrapper: d7b8f60a5ad07947798902bf805bcac01ea6273a
-  react-native-config: 8e425892a531627c52db765be3088185cb871e19
-  react-native-get-random-values: 0fd2b6a3129988d701d10e30f0622d5f039531bc
-  react-native-mail: 6e83813066984b26403d3fdfe79ac7bb31857e3c
-  react-native-netinfo: be701059f57093572e5ba08cba14483d334b425d
-  react-native-network-info: 23b4f34419d7998727c9e50bf8dee3c1bd3f975a
+  React-graphics: 61a026e1c1e7e20d20ac9fec6f6de631732b233d
+  React-hermes: a7054fbcbda3957e3c5eaad06ef9bf79998d535a
+  React-ImageManager: 2bbd6eb2e696bc680f76f84563e4b87d241614e1
+  React-jserrorhandler: 56fa04d49bfbe54ddfece7916673a73ebfea286b
+  React-jsi: f3ce1dd2e950b6ad12b65ea3ef89168f1b94c584
+  React-jsiexecutor: b4df3a27973d82f9abf3c4bd0f88e042cda25f16
+  React-jsinspector: 97ea746c023687de7313ee289817d6991d596c7d
+  React-jsitracing: 3b6060bbf5317663667e1dd93560c7943ab86ccc
+  React-logger: 257858bd55f3a4e1bc0cf07ddc8fb9faba6f8c7c
+  React-Mapbuffer: 6c1cacdbf40b531f549eba249e531a7d0bfd8e7f
+  react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
+  react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
+  react-native-charts-wrapper: 4268219d67a6fd7e94453d77d31b38ef1cd23860
+  react-native-config: 7cd105e71d903104e8919261480858940a6b9c0e
+  react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
+  react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
+  react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
+  react-native-network-info: d1290ffc0bd0709e11436f5b8d7f605dcc5c4530
   react-native-onesignal: 592184d34780d04ebbea2b9844d5b6088606cb30
-  react-native-pager-view: 49d43927514af5e800108d3c5f651eb58b595d24
-  react-native-randombytes: 3c8f3e89d12487fd03a2f966c288d495415fc116
-  react-native-safe-area-context: b72c4611af2e86d80a59ac76279043d8f75f454c
-  react-native-simple-toast: 59d8b58998dac9f063b46d95f9fd7fd7caab6101
-  react-native-slider: 2f40d233a8e04d2659116389a2c7a531ee2f651c
-  react-native-sodium: aa1ff846402c8356a754c0dc20430d8e5acce266
-  react-native-udp: 9019822bb289526c077f6266f0d1d6ed104777ed
-  react-native-video: 2aad0d963bf3952bd9ebb2f53fab799338e8e202
-  react-native-webview: a71525b1ab760230fbf37303d8371fbe72051c7d
+  react-native-pager-view: 54bed894cecebe28cede54c01038d9d1e122de43
+  react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
+  react-native-safe-area-context: b7daa1a8df36095a032dff095a1ea8963cb48371
+  react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7
+  react-native-slider: ce295d2bf830a7990af05b0bd70ab28c133e230c
+  react-native-sodium: 274874541aa6bd00040f28c2e1e5118cbf113c0e
+  react-native-udp: ff9d13e523f2b58e6bc5d4d32321ac60671b5dc9
+  react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
+  react-native-webview: 553abd09f58e340fdc7746c9e2ae096839e99911
   React-nativeconfig: ba9a2e54e2f0882cf7882698825052793ed4c851
-  React-NativeModulesApple: 84aaad2b0e546d7b839837ca537f6e72804a4cad
+  React-NativeModulesApple: 8d11ff8955181540585c944cf48e9e7236952697
   React-perflogger: ed4e0c65781521e0424f2e5e40b40cc7879d737e
   React-RCTActionSheet: 49d53ff03bb5688ca4606c55859053a0cd129ea5
-  React-RCTAnimation: 3075449f26cb98a52bcbf51cccd0c7954e2a71db
-  React-RCTAppDelegate: 9a419c4dda9dd039ad851411546dd297b930c454
-  React-RCTBlob: e81ab773a8fc1e9dceed953e889f936a7b7b3aa6
-  React-RCTFabric: 47a87a3e3fa751674f7e64d0bcd58976b8c57db9
-  React-RCTImage: d570531201c6dce7b5b63878fa8ecec0cc311c4c
-  React-RCTLinking: af888972b925d2811633d47853c479e88c35eb4d
-  React-RCTNetwork: 5728a06ff595003eca628f43f112a804f4a9a970
-  React-RCTSettings: ba3665b0569714a8aaceee5c7d23b943e333fa55
-  React-RCTText: b733fa984f0336b072e47512898ba91214f66ddb
-  React-RCTVibration: 0cbcbbd8781b6f6123671bae9ee5dd20d621af6c
-  React-rendererdebug: 9fc8f7d0bd19f2a3fe3791982af550b5e1535ff7
+  React-RCTAnimation: 07b4923885c52c397c4ec103924bf6e53b42c73e
+  React-RCTAppDelegate: 316e295076734baf9bdf1bfac7d92ab647aed930
+  React-RCTBlob: 85c57b0d5e667ff8a472163ba3af0628171a64bb
+  React-RCTFabric: 97c1465ded4dc92841f5376a39e43e1b2c455f40
+  React-RCTImage: b965c85bec820e2a9c154b1fb00a2ecdd59a9c92
+  React-RCTLinking: 75f04a5f27c26c4e73a39c50df470820d219df79
+  React-RCTNetwork: c1a9143f4d5778efc92da40d83969d03912ccc24
+  React-RCTSettings: c6800f91c0ecd48868cd5db754b0b0a7f5ffe039
+  React-RCTText: b923e24f9b7250bc4f7ab154c4168ad9f8d8fc9d
+  React-RCTVibration: 08c4f0c917c435b3619386c25a94ee5d64c250f0
+  React-rendererdebug: 3cda04217d9df67b94397ee0ead8ef3d8b7e427b
   React-rncore: 4013508a2f3fcf46c961919bbbd4bfdda198977e
-  React-RuntimeApple: a852a6e06ab20711658873f39cb10b0033bea19d
-  React-RuntimeCore: 12e5e176c0cb09926f3e6f37403a84d2e0f203a7
+  React-RuntimeApple: 447844a2bdb0a03ffd24e5b4a4b96cfc50325b88
+  React-RuntimeCore: 9b5bffdaccee9b707b1c2694c9044e13ff0bb087
   React-runtimeexecutor: 0e688aefc14c6bc8601f4968d8d01c3fb6446844
-  React-RuntimeHermes: 80c03a5215520c9733764ba11cbe535053c9746d
-  React-runtimescheduler: 2cbd0f3625b30bba08e8768776107f6f0203159b
-  React-utils: 9fa4e5d0b5e6c6c85c958f19d6ef854337886417
-  ReactCommon: 9f285823dbe955099978d9bff65a7653ca029256
-  RNCAsyncStorage: 01062b75ce749e3a18091a9ad7749effdf09ea43
-  RNCCheckbox: 450ce156f3e29e25efa0315c96cfbabe5a39ded1
-  RNCClipboard: b0541df1bb88935d40bdc93b41b7d8e3334c998a
-  RNDeviceInfo: d3e91ffb33ee97a7982108476edb68cb3672efa6
-  RNGestureHandler: d5aafad9a7d1506a8bcab6fbc04384372c8ca86b
-  RNICloudStore: e0a579c3658e4ef49b84de2575886459c3ad695d
-  RNLocalize: 5bcbb34b6f9cb4c2010ccfedb03f6a2b6f98466d
-  RNOS: d07e5090b5060c6f2b83116d740a32cfdb33afe3
-  RNPermissions: d8cab6cb0763f7c3347996003dd5c7eab91e4c50
-  RNReactNativeSharedGroupPreferences: d4869af3c7757405b6b5ac633d0ef5f9886a9be7
-  RNReanimated: fe62058b0e1ecb46e252d63d27580f36cd6d9eb2
-  RNScreens: 6584fce529be4800e3d12c8069376df9e12bafaf
-  RNShare: fd38ef4e36245bc590de292a139a2b9e332a4665
-  RNSVG: 6ebe31273563567f36f6a871b989bca09cd3827b
-  RNTestFlight: b81078855c2739e90458ad2686a514ee5dcc60de
+  React-RuntimeHermes: 4d6ef6bb0f2b0b40d59143317f6b99c82764c959
+  React-runtimescheduler: cfbe85c3510c541ec6dc815c7729b41304b67961
+  React-utils: f242eb7e7889419d979ca0e1c02ccc0ea6e43b29
+  ReactCommon: f7da14a8827b72704169a48c929bcde802698361
+  RNCAsyncStorage: b90b71f45b8b97be43bc4284e71a6af48ac9f547
+  RNCCheckbox: a3ca9978cb0846b981d28da4e9914bd437403d77
+  RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
+  RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
+  RNGestureHandler: efed690b8493a00b99654043daeb1335276ac4a2
+  RNICloudStore: bc6e225811637c09bd1eb055d6cd7448e61cd451
+  RNLocalize: a64514b46a01375fdfae9349036b4dc7130333b5
+  RNOS: 6f2f9a70895bbbfbdad7196abd952e7b01d45027
+  RNPermissions: 2af759cf053542b2b4b3c4cf9f43874796106f2c
+  RNReactNativeSharedGroupPreferences: 29092869fc2e40d5baca5e15d82fa5c24a668977
+  RNReanimated: f4ff116e33e0afc3d127f70efe928847c7c66355
+  RNScreens: aa943ad421c3ced3ef5a47ede02b0cbfc43a012e
+  RNShare: be91a5c149585affb02c25b351bd07ba927c7006
+  RNSVG: 07dbd870b0dcdecc99b3a202fa37c8ca163caec2
+  RNTestFlight: 3419178faa8527ecfe803607fd338a3803f1fb0d
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   SwiftAlgorithms: 38dda4731d19027fdeee1125f973111bf3386b53
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
-  TcpSockets: d7fa8433e76a140bb34349c813eaa860e7f087af
+  TcpSockets: 14306fb79f9750ea7d2ddd02d8bed182abb01797
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  Yoga: 950bbfd7e6f04790fdb51149ed51df41f329fcc8
+  Yoga: 2246eea72aaf1b816a68a35e6e4b74563653ae09
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
 PODFILE CHECKSUM: f2b3cf4c49920f615cb5cba978ce43a6e636b29f

package.json

@@ -28,38 +28,38 @@
   "dependencies": {
     "@babel/preset-typescript": "7.21.0",
     "@bonfida/spl-name-service": "^1.1.1",
-    "@coral-xyz/anchor": "^0.28.0",
+    "@coral-xyz/anchor": "^0.31.0",
     "@gorhom/bottom-sheet": "4.6.0",
     "@gorhom/portal": "1.0.14",
-    "@helium/account-fetch-cache": "0.9.31",
-    "@helium/account-fetch-cache-hooks": "0.9.31",
+    "@helium/account-fetch-cache": "0.10.3",
+    "@helium/account-fetch-cache-hooks": "0.10.3",
     "@helium/address": "4.10.2",
-    "@helium/circuit-breaker-sdk": "0.9.31",
+    "@helium/circuit-breaker-sdk": "0.10.3",
     "@helium/crypto-react-native": "4.8.0",
-    "@helium/currency-utils": "0.9.31",
-    "@helium/data-credits-sdk": "0.9.31",
-    "@helium/distributor-oracle": "0.9.31",
-    "@helium/fanout-sdk": "0.9.31",
-    "@helium/helium-entity-manager-sdk": "0.9.31",
-    "@helium/helium-react-hooks": "0.9.31",
-    "@helium/helium-sub-daos-sdk": "0.9.31",
+    "@helium/currency-utils": "0.10.3",
+    "@helium/data-credits-sdk": "0.10.3",
+    "@helium/distributor-oracle": "0.10.3",
+    "@helium/fanout-sdk": "0.10.3",
+    "@helium/helium-entity-manager-sdk": "0.10.3",
+    "@helium/helium-react-hooks": "0.10.3",
+    "@helium/helium-sub-daos-sdk": "0.10.3",
     "@helium/http": "4.7.5",
-    "@helium/idls": "0.9.31",
-    "@helium/lazy-distributor-sdk": "0.9.31",
-    "@helium/modular-governance-hooks": "^0.0.13",
-    "@helium/modular-governance-idls": "0.0.13",
-    "@helium/no-emit-sdk": "^0.9.31",
-    "@helium/onboarding": "4.11.0",
-    "@helium/organization-sdk": "^0.0.13",
+    "@helium/idls": "0.10.3",
+    "@helium/lazy-distributor-sdk": "0.10.3",
+    "@helium/modular-governance-hooks": "^0.1.5",
+    "@helium/modular-governance-idls": "0.1.5",
+    "@helium/no-emit-sdk": "^0.10.3",
+    "@helium/onboarding": "4.14.0",
+    "@helium/organization-sdk": "^0.1.5",
     "@helium/proto-ble": "4.0.0",
-    "@helium/react-native-sdk": "3.0.5",
-    "@helium/spl-utils": "0.9.31",
-    "@helium/state-controller-sdk": "^0.0.13",
-    "@helium/sus": "0.9.31",
+    "@helium/react-native-sdk": "3.1.0",
+    "@helium/spl-utils": "0.10.3",
+    "@helium/state-controller-sdk": "^0.1.5",
+    "@helium/sus": "0.10.3",
     "@helium/transactions": "4.8.1",
-    "@helium/treasury-management-sdk": "0.9.31",
-    "@helium/voter-stake-registry-hooks": "0.9.31",
-    "@helium/voter-stake-registry-sdk": "0.9.31",
+    "@helium/treasury-management-sdk": "0.10.3",
+    "@helium/voter-stake-registry-hooks": "0.10.3",
+    "@helium/voter-stake-registry-sdk": "0.10.3",
     "@helium/wallet-link": "4.11.0",
     "@jup-ag/api": "^6.0.6",
     "@keystonehq/keystone-sdk": "^0.8.0",
@@ -278,13 +278,13 @@
     "@types/react": "18",
     "react": "18.2.0",
     "@solana/wallet-adapter-react": "0.15.33",
-    "@helium/account-fetch-cache": "0.9.31",
-    "@helium/account-fetch-cache-hooks": "0.9.31",
-    "@helium/helium-react-hooks": "0.9.31",
-    "@helium/voter-stake-registry-hooks": "0.9.31",
-    "@helium/voter-stake-registry-sdk": "0.9.31",
-    "@helium/modular-governance-hooks": "^0.0.13",
-    "@helium/onboarding": "4.11.0"
+    "@helium/account-fetch-cache": "0.10.3",
+    "@helium/account-fetch-cache-hooks": "0.10.3",
+    "@helium/helium-react-hooks": "0.10.3",
+    "@helium/voter-stake-registry-hooks": "0.10.3",
+    "@helium/voter-stake-registry-sdk": "0.10.3",
+    "@helium/modular-governance-hooks": "^0.1.5",
+    "@helium/onboarding": "4.14.0"
   },
   "react-native": {
     "zlib": "browserify-zlib",

src/hooks/useImplicitBurn.ts

@@ -66,7 +66,7 @@ export function useImplicitBurn(): {
                   DC_MINT,
                 ),
               ])
-              .accounts({
+              .accountsPartial({
                 dcMint: DC_MINT,
                 recipient: wallet,
               })

src/solana/SolanaProvider.tsx

@@ -25,15 +25,14 @@ import React, {
   useRef,
 } from 'react'
 import { useAsync } from 'react-async-hook'
-import Config from 'react-native-config'
 import { useSelector } from 'react-redux'
 import nacl from 'tweetnacl'
 import KeystoneModal, {
   KeystoneModalRef,
 } from '../features/keystone/KeystoneModal'
 import LedgerModal, { LedgerModalRef } from '../features/ledger/LedgerModal'
 import { useAccountStorage } from '../storage/AccountStorageProvider'
-import { getSessionKey, getSolanaKeypair } from '../storage/secureStorage'
+import { getSolanaKeypair } from '../storage/secureStorage'
 import { RootState } from '../store/rootReducer'
 import { appSlice } from '../store/slices/appSlice'
 import { useAppDispatch } from '../store/store'
@@ -46,17 +45,11 @@ const useSolanaHook = () => {
   const cluster = useSelector(
     (state: RootState) => state.app.cluster || 'mainnet-beta',
   )
-  const { loading, result: sessionKey } = useAsync(getSessionKey, [])
   const ledgerModalRef = useRef<LedgerModalRef>()
   const keystoneModalRef = useRef<KeystoneModalRef>()
-  const connection = useMemo(() => {
-    const sessionKeyActual =
-      !loading && !sessionKey ? Config.RPC_SESSION_KEY_FALLBACK : sessionKey
-
-    if (sessionKeyActual) {
-      return getConnection(cluster, sessionKeyActual)
-    }
-  }, [cluster, sessionKey, loading])
+  const connection: WrappedConnection | undefined = useMemo(() => {
+    return getConnection(cluster)
+  }, [cluster])
   const isDevnet = useMemo(() => cluster === 'devnet', [cluster])
   const address = useMemo(
     () => currentAccount?.address,
@@ -311,7 +304,7 @@ const useSolanaHook = () => {
     anchorProvider,
     cluster,
     isDevnet,
-    connection,
+    connection: connection as WrappedConnection | undefined,
     updateCluster,
     cache,
     signMsg,