Hotspot v3

babel.config.js

@@ -20,16 +20,14 @@ const baseConfig = {
           '@helium/crypto': './node_modules/@helium/crypto-react-native',
           '@assets': './src/assets',
           '@components': './src/components',
-          '@constants': './src/constants',
           '@hooks': './src/hooks',
-          '@theme': './src/theme',
           '@utils': './src/utils',
-          '@storage': './src/storage',
+          '@config': './src/config',
           '@types': './src/types',
           '@features': './src/features',
-          '@services': './src/services',
+          '@services': './src/app/services',
           '@store': './src/store',
-          '@/solana': './src/solana',
+          '@app': './src/app',
         },
         extensions: ['.ios.js', '.android.js', '.js', '.ts', '.tsx', '.json'],
         root: ['./src'],

index.js

@@ -8,12 +8,12 @@ import 'react-native-url-polyfill/auto'
 import { Provider as ReduxProvider } from 'react-redux'
 import { PersistGate } from 'redux-persist/integration/react'
 import { name as appName } from './app.json'
-import App from './src/App'
+import App from './src/app/App'
 import { GlobalError } from './src/components/GlobalError'
-import AccountStorageProvider from './src/storage/AccountStorageProvider'
-import AppStorageProvider from './src/storage/AppStorageProvider'
-import LanguageProvider from './src/storage/LanguageProvider'
-import NotificationStorageProvider from './src/storage/NotificationStorageProvider'
+import AccountStorageProvider from './src/config/storage/AccountStorageProvider'
+import AppStorageProvider from './src/config/storage/AppStorageProvider'
+import LanguageProvider from './src/config/storage/LanguageProvider'
+import NotificationStorageProvider from './src/config/storage/NotificationStorageProvider'
 import { persistor } from './src/store/persistence'
 import store from './src/store/store'
 import './src/utils/i18n'

ios/Podfile

@@ -56,8 +56,11 @@ target 'HeliumWallet' do
   permissions_path = '../node_modules/react-native-permissions/ios'
   setup_permissions(['BluetoothPeripheral'])
 
+  $RNMapboxMapsImpl = 'mapbox'
+  $RNMapboxMapsVersion = '= 11.4.0'
+
   post_install do |installer|
-    $RNMBGL.post_install(installer)
+    $RNMapboxMaps.post_install(installer)
 
     # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
     react_native_post_install(

ios/Podfile.lock

@@ -22,6 +22,8 @@ PODS:
   - EXImageLoader (4.7.0):
     - ExpoModulesCore
     - React-Core
+  - EXLocation (17.0.1):
+    - ExpoModulesCore
   - Expo (51.0.24):
     - ExpoModulesCore
   - ExpoAsset (10.0.10):
@@ -118,13 +120,13 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - maplibre-react-native (9.1.0):
-    - maplibre-react-native/DynamicLibrary (= 9.1.0)
-    - React
-    - React-Core
-  - maplibre-react-native/DynamicLibrary (9.1.0):
-    - React
-    - React-Core
+  - MapboxCommon (24.4.0)
+  - MapboxCoreMaps (11.4.0):
+    - MapboxCommon (~> 24.4)
+  - MapboxMaps (11.4.0):
+    - MapboxCommon (= 24.4.0)
+    - MapboxCoreMaps (= 11.4.0)
+    - Turf (= 2.8.0)
   - MultiplatformBleAdapter (0.1.9)
   - OneSignalXCFramework (5.2.2):
     - OneSignalXCFramework/OneSignalComplete (= 5.2.2)
@@ -1109,6 +1111,8 @@ PODS:
     - Charts (= 4.1.0)
     - React
     - SwiftyJSON (= 5.0)
+  - react-native-compass-heading (1.5.0):
+    - React-Core
   - react-native-config (1.4.6):
     - react-native-config/App (= 1.4.6)
   - react-native-config/App (1.4.6):
@@ -1421,6 +1425,27 @@ PODS:
     - React-Core
   - RNCClipboard (1.5.1):
     - React-Core
+  - RNCMaskedView (0.3.2):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
   - RNDeviceInfo (8.7.1):
     - React-Core
   - RNGestureHandler (2.18.1):
@@ -1448,6 +1473,17 @@ PODS:
     - React
   - RNLocalize (2.2.3):
     - React-Core
+  - rnmapbox-maps (10.1.31):
+    - MapboxMaps (= 11.4.0)
+    - React
+    - React-Core
+    - rnmapbox-maps/DynamicLibrary (= 10.1.31)
+    - Turf
+  - rnmapbox-maps/DynamicLibrary (10.1.31):
+    - MapboxMaps (= 11.4.0)
+    - React
+    - React-Core
+    - Turf
   - RNOS (1.2.6):
     - React
   - RNPermissions (3.9.2):
@@ -1509,6 +1545,13 @@ PODS:
   - TcpSockets (3.3.2):
     - React
   - Toast (4.0.0)
+  - Turf (2.8.0)
+  - VisionCamera (4.5.3):
+    - VisionCamera/Core (= 4.5.3)
+    - VisionCamera/React (= 4.5.3)
+  - VisionCamera/Core (4.5.3)
+  - VisionCamera/React (4.5.3):
+    - React-Core
   - Yoga (0.0.0)
   - ZXingObjC/Core (3.6.9)
   - ZXingObjC/OneD (3.6.9):
@@ -1524,6 +1567,7 @@ DEPENDENCIES:
   - EXBarCodeScanner (from `../node_modules/expo-barcode-scanner/ios`)
   - EXConstants (from `../node_modules/expo-constants/ios`)
   - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
+  - EXLocation (from `../node_modules/expo-location/ios`)
   - Expo (from `../node_modules/expo`)
   - ExpoAsset (from `../node_modules/expo-asset/ios`)
   - ExpoCamera (from `../node_modules/expo-camera/ios`)
@@ -1542,7 +1586,6 @@ DEPENDENCIES:
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
   - lottie-ios (from `../node_modules/lottie-ios`)
   - lottie-react-native (from `../node_modules/lottie-react-native`)
-  - "maplibre-react-native (from `../node_modules/@maplibre/maplibre-react-native`)"
   - OneSignalXCFramework (< 6.0, >= 5.0)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -1573,6 +1616,7 @@ DEPENDENCIES:
   - react-native-ble-plx (from `../node_modules/react-native-ble-plx`)
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
   - react-native-charts-wrapper (from `../node_modules/react-native-charts-wrapper`)
+  - react-native-compass-heading (from `../node_modules/react-native-compass-heading`)
   - react-native-config (from `../node_modules/react-native-config`)
   - react-native-config/Extension (from `../node_modules/react-native-config`)
   - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
@@ -1615,10 +1659,12 @@ DEPENDENCIES:
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCCheckbox (from `../node_modules/@react-native-community/checkbox`)"
   - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
+  - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNICloudStore (from `../node_modules/react-native-icloudstore`)
   - RNLocalize (from `../node_modules/react-native-localize`)
+  - "rnmapbox-maps (from `../node_modules/@rnmapbox/maps`)"
   - RNOS (from `../node_modules/react-native-os`)
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNReactNativeSharedGroupPreferences (from `../node_modules/react-native-shared-group-preferences`)
@@ -1628,19 +1674,24 @@ DEPENDENCIES:
   - RNSVG (from `../node_modules/react-native-svg`)
   - RNTestFlight (from `../node_modules/react-native-test-flight`)
   - TcpSockets (from `../node_modules/react-native-tcp`)
+  - VisionCamera (from `../node_modules/react-native-vision-camera`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
   trunk:
     - BCrypt
     - BEMCheckBox
     - Charts
+    - MapboxCommon
+    - MapboxCoreMaps
+    - MapboxMaps
     - MultiplatformBleAdapter
     - OneSignalXCFramework
     - SocketRocket
     - SwiftAlgorithms
     - SwiftyJSON
     - Toast
+    - Turf
     - ZXingObjC
 
 EXTERNAL SOURCES:
@@ -1658,6 +1709,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-constants/ios"
   EXImageLoader:
     :path: "../node_modules/expo-image-loader/ios"
+  EXLocation:
+    :path: "../node_modules/expo-location/ios"
   Expo:
     :path: "../node_modules/expo"
   ExpoAsset:
@@ -1695,8 +1748,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/lottie-ios"
   lottie-react-native:
     :path: "../node_modules/lottie-react-native"
-  maplibre-react-native:
-    :path: "../node_modules/@maplibre/maplibre-react-native"
   RCT-Folly:
     :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTDeprecation:
@@ -1751,6 +1802,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/blur"
   react-native-charts-wrapper:
     :path: "../node_modules/react-native-charts-wrapper"
+  react-native-compass-heading:
+    :path: "../node_modules/react-native-compass-heading"
   react-native-config:
     :path: "../node_modules/react-native-config"
   react-native-get-random-values:
@@ -1833,6 +1886,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/checkbox"
   RNCClipboard:
     :path: "../node_modules/@react-native-community/clipboard"
+  RNCMaskedView:
+    :path: "../node_modules/@react-native-masked-view/masked-view"
   RNDeviceInfo:
     :path: "../node_modules/react-native-device-info"
   RNGestureHandler:
@@ -1841,6 +1896,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-icloudstore"
   RNLocalize:
     :path: "../node_modules/react-native-localize"
+  rnmapbox-maps:
+    :path: "../node_modules/@rnmapbox/maps"
   RNOS:
     :path: "../node_modules/react-native-os"
   RNPermissions:
@@ -1859,6 +1916,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-test-flight"
   TcpSockets:
     :path: "../node_modules/react-native-tcp"
+  VisionCamera:
+    :path: "../node_modules/react-native-vision-camera"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -1873,6 +1932,7 @@ SPEC CHECKSUMS:
   EXBarCodeScanner: e2dd9b42c1b522a2adc9202b1dfbc64cb34456d1
   EXConstants: 409690fbfd5afea964e5e9d6c4eb2c2b59222c59
   EXImageLoader: ab589d67d6c5f2c33572afea9917304418566334
+  EXLocation: 43e9b582ca63a23c6f0a18d8cbe2145b3a388b55
   Expo: 798848eae1daf13363d69790986146b08d0cf92f
   ExpoAsset: 323700f291684f110fb55f0d4022a3362ea9f875
   ExpoCamera: a5d000b22cd7dfd2c5904ed960e549de42c96da0
@@ -1891,7 +1951,9 @@ SPEC CHECKSUMS:
   hermes-engine: 8c1577f3fdb849cbe7729c2e7b5abc4b845e88f8
   lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494
   lottie-react-native: f851c0e235f171d99083c803f728f644be1dcf65
-  maplibre-react-native: 3a0d9beca427ff9000d75e0974c366ecd3c5375e
+  MapboxCommon: 6acbd8ff41d66abf498e1558b0739f25c562945a
+  MapboxCoreMaps: f306bb1b10ebe995a2247b40e99322ab7f9b8071
+  MapboxMaps: 82044383ae19ec124ff444ec4b5d3ce82cb36ba5
   MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
   OneSignalXCFramework: f06edd9b146c7ac5935136a117ce2a5fdd6420f6
   RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
@@ -1921,6 +1983,7 @@ SPEC CHECKSUMS:
   react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
   react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
   react-native-charts-wrapper: 4268219d67a6fd7e94453d77d31b38ef1cd23860
+  react-native-compass-heading: 1b4403d1c99dfd8311073ca8fc52bfc8e365cfac
   react-native-config: 7cd105e71d903104e8919261480858940a6b9c0e
   react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
   react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
@@ -1962,10 +2025,12 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: b90b71f45b8b97be43bc4284e71a6af48ac9f547
   RNCCheckbox: a3ca9978cb0846b981d28da4e9914bd437403d77
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
+  RNCMaskedView: da52ec927af4b4c3f3f6b5b5e816a69be62fe642
   RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
   RNGestureHandler: efed690b8493a00b99654043daeb1335276ac4a2
   RNICloudStore: bc6e225811637c09bd1eb055d6cd7448e61cd451
   RNLocalize: a64514b46a01375fdfae9349036b4dc7130333b5
+  rnmapbox-maps: 961b998761de9672c448aa17144b987410890992
   RNOS: 6f2f9a70895bbbfbdad7196abd952e7b01d45027
   RNPermissions: 2af759cf053542b2b4b3c4cf9f43874796106f2c
   RNReactNativeSharedGroupPreferences: 29092869fc2e40d5baca5e15d82fa5c24a668977
@@ -1979,9 +2044,11 @@ SPEC CHECKSUMS:
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
   TcpSockets: 14306fb79f9750ea7d2ddd02d8bed182abb01797
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
+  Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
+  VisionCamera: cb84d0d8485b3e67c91b62931d3aa88f49747c92
   Yoga: 950bbfd7e6f04790fdb51149ed51df41f329fcc8
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: d44dfed27ca86fe0b1eb67aab0856b7cc9e24ff7
+PODFILE CHECKSUM: af8e0f0904c0f9cc43a95eef4e1feb504870ee6e
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.1