Merge branch main of https://github.com/helium/wallet-app into alldom…

…ains-integration
helium · Aug 10, 2023 · 7261c13 · 7261c13
2 parents e846a09 + 83e9812
commit 7261c13
Show file tree

Hide file tree

Showing 100 changed files with 4,128 additions and 4,351 deletions.
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
@@ -1,11 +1,11 @@
-arguments=
+arguments=--init-script /var/folders/ck/r25tcygs77n6hv8d515p1w_c0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/ck/r25tcygs77n6hv8d515p1w_c0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home
+java.home=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

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.1.1;
+				MARKETING_VERSION = 2.2.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1035,7 +1035,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1203,7 +1203,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2.0;
 				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.1.1;
+				MARKETING_VERSION = 2.2.0;
 				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.1.1;
+				MARKETING_VERSION = 2.2.0;
 				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.1.1;
+				MARKETING_VERSION = 2.2.0;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.helium.wallet.app.HeliumWalletWidget;

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -841,7 +841,7 @@ SPEC CHECKSUMS:
   BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
-  Charts: ce0768268078eee0336f122c3c4ca248e4e204c5
+  Charts: 354f86803d11d9c35de280587fef50d1af063978
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
   EXBarCodeScanner: 8e23fae8d267dbef9f04817833a494200f1fce35

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "helium-wallet",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "private": true,
   "scripts": {
     "postinstall": "patch-package && ./node_modules/.bin/rn-nodeify --hack --install && npx jetify",
@@ -39,24 +39,25 @@
     "@coral-xyz/anchor": "0.26.0",
     "@gorhom/bottom-sheet": "4.4.6",
     "@gorhom/portal": "1.0.14",
-    "@helium/account-fetch-cache": "^0.2.5",
-    "@helium/address": "4.6.2",
+    "@helium/account-fetch-cache": "^0.2.17",
+    "@helium/account-fetch-cache-hooks": "^0.2.17",
+    "@helium/address": "4.10.2",
+    "@helium/circuit-breaker-sdk": "^0.2.17",
     "@helium/crypto-react-native": "4.8.0",
-    "@helium/currency": "4.11.1",
     "@helium/currency-utils": "0.1.1",
-    "@helium/data-credits-sdk": "0.1.2",
-    "@helium/distributor-oracle": "^0.2.6",
-    "@helium/fanout-sdk": "0.1.2",
-    "@helium/helium-entity-manager-sdk": "^0.2.6",
-    "@helium/helium-react-hooks": "0.1.2",
-    "@helium/helium-sub-daos-sdk": "0.1.2",
+    "@helium/data-credits-sdk": "^0.2.17",
+    "@helium/distributor-oracle": "^0.2.17",
+    "@helium/fanout-sdk": "^0.2.17",
+    "@helium/helium-entity-manager-sdk": "^0.2.17",
+    "@helium/helium-react-hooks": "^0.2.17",
+    "@helium/helium-sub-daos-sdk": "^0.2.17",
     "@helium/http": "4.7.5",
-    "@helium/idls": "^0.2.5",
-    "@helium/lazy-distributor-sdk": "0.1.2",
+    "@helium/idls": "^0.2.17",
+    "@helium/lazy-distributor-sdk": "^0.2.17",
     "@helium/onboarding": "4.9.0",
     "@helium/proto-ble": "4.0.0",
     "@helium/react-native-sdk": "1.0.0",
-    "@helium/spl-utils": "^0.2.6",
+    "@helium/spl-utils": "^0.2.17",
     "@helium/transactions": "4.8.1",
     "@helium/treasury-management-sdk": "0.1.2",
     "@helium/voter-stake-registry-sdk": "0.1.2",
@@ -84,6 +85,7 @@
     "@shopify/restyle": "1.8.0",
     "@solana/spl-account-compression": "0.1.4",
     "@solana/spl-token": "0.3.6",
+    "@solana/wallet-adapter-react": "^0.15.33",
     "@solana/wallet-standard-features": "1.0.0",
     "@solana/web3.js": "1.64.0",
     "@tradle/react-native-http": "2.0.1",

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,36 +1,37 @@
-import './polyfill'
+import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'
+import { PortalHost, PortalProvider } from '@gorhom/portal'
+import { AccountContext } from '@helium/account-fetch-cache-hooks'
+import { DarkTheme, NavigationContainer } from '@react-navigation/native'
+import MapboxGL from '@rnmapbox/maps'
+import { ThemeProvider } from '@shopify/restyle'
+import TokensProvider from '@storage/TokensProvider'
+import globalStyles from '@theme/globalStyles'
+import { darkThemeColors, lightThemeColors, theme } from '@theme/theme'
+import { useColorScheme } from '@theme/themeHooks'
+import * as SplashLib from 'expo-splash-screen'
 import React, { useMemo } from 'react'
 import { LogBox, Platform } from 'react-native'
-import { ThemeProvider } from '@shopify/restyle'
-import { DarkTheme, NavigationContainer } from '@react-navigation/native'
 import useAppState from 'react-native-appstate-hook'
-import OneSignal, { OpenedEvent } from 'react-native-onesignal'
 import Config from 'react-native-config'
-import { SafeAreaProvider } from 'react-native-safe-area-context'
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
-import { PortalHost, PortalProvider } from '@gorhom/portal'
-import * as SplashLib from 'expo-splash-screen'
-import { AccountProvider } from '@helium/helium-react-hooks'
-import { theme, darkThemeColors, lightThemeColors } from '@theme/theme'
-import { useColorScheme } from '@theme/themeHooks'
-import globalStyles from '@theme/globalStyles'
-import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'
-import MapboxGL from '@rnmapbox/maps'
-import useMount from './hooks/useMount'
-import RootNavigator from './navigation/RootNavigator'
-import { useAccountStorage } from './storage/AccountStorageProvider'
-import LockScreen from './features/lock/LockScreen'
-import SecurityScreen from './features/security/SecurityScreen'
-import OnboardingProvider from './features/onboarding/OnboardingProvider'
-import { BalanceProvider } from './utils/Balance'
-import { useDeepLinking } from './utils/linking'
-import { useNotificationStorage } from './storage/NotificationStorageProvider'
+import OneSignal, { OpenedEvent } from 'react-native-onesignal'
+import { SafeAreaProvider } from 'react-native-safe-area-context'
 import NetworkAwareStatusBar from './components/NetworkAwareStatusBar'
+import SplashScreen from './components/SplashScreen'
 import WalletConnectProvider from './features/dappLogin/WalletConnectProvider'
+import LockScreen from './features/lock/LockScreen'
+import OnboardingProvider from './features/onboarding/OnboardingProvider'
+import SecurityScreen from './features/security/SecurityScreen'
+import useMount from './hooks/useMount'
 import { navigationRef } from './navigation/NavigationHelper'
-import SplashScreen from './components/SplashScreen'
+import RootNavigator from './navigation/RootNavigator'
+import './polyfill'
 import { useSolana } from './solana/SolanaProvider'
 import WalletSignProvider from './solana/WalletSignProvider'
+import { useAccountStorage } from './storage/AccountStorageProvider'
+import { useNotificationStorage } from './storage/NotificationStorageProvider'
+import { BalanceProvider } from './utils/Balance'
+import { useDeepLinking } from './utils/linking'
 
 SplashLib.preventAutoHideAsync().catch(() => {
   /* reloading the app might trigger some race conditions, ignore them */
@@ -55,7 +56,7 @@ const App = () => {
 
   const { appState } = useAppState()
   const { restored: accountsRestored } = useAccountStorage()
-  const { connection } = useSolana()
+  const { cache } = useSolana()
   const { setOpenedNotification } = useNotificationStorage()
 
   const linking = useDeepLinking()
@@ -112,14 +113,10 @@ const App = () => {
               <BottomSheetModalProvider>
                 <PortalHost name="browser-portal" />
                 <OnboardingProvider baseUrl={Config.ONBOARDING_API_URL}>
-                  {connection && (
-                    <LockScreen>
-                      <AccountProvider
-                        extendConnection={false}
-                        commitment="confirmed"
-                        connection={connection}
-                      >
-                        <WalletConnectProvider>
+                  <WalletConnectProvider>
+                    {cache && (
+                      <LockScreen>
+                        <AccountContext.Provider value={cache}>
                           {accountsRestored && (
                             <>
                               <NavigationContainer
@@ -128,10 +125,12 @@ const App = () => {
                                 ref={navigationRef}
                               >
                                 <BalanceProvider>
-                                  <WalletSignProvider>
-                                    <NetworkAwareStatusBar />
-                                    <RootNavigator />
-                                  </WalletSignProvider>
+                                  <TokensProvider>
+                                    <WalletSignProvider>
+                                      <NetworkAwareStatusBar />
+                                      <RootNavigator />
+                                    </WalletSignProvider>
+                                  </TokensProvider>
                                 </BalanceProvider>
                               </NavigationContainer>
                               <SecurityScreen
@@ -142,10 +141,10 @@ const App = () => {
                               />
                             </>
                           )}
-                        </WalletConnectProvider>
-                      </AccountProvider>
-                    </LockScreen>
-                  )}
+                        </AccountContext.Provider>
+                      </LockScreen>
+                    )}
+                  </WalletConnectProvider>
                 </OnboardingProvider>
               </BottomSheetModalProvider>
             </PortalProvider>

diff --git a/src/assets/images/config.svg b/src/assets/images/config.svg