Merge pull request #5703 from bithyve/dev

Release 1.3.0(428)
bithyve · Dec 9, 2024 · 53ad67d · 53ad67d
2 parents e712d79 + 29b748f
commit 53ad67d
Show file tree

Hide file tree

Showing 193 changed files with 10,278 additions and 4,268 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,5 +9,6 @@
   "prettier.bracketSameLine": true,
   "prettier.arrowParens": "avoid",
   "javascript.updateImportsOnFileMove.enabled": "always",
-  "typescript.updateImportsOnFileMove.enabled": "always"
+  "typescript.updateImportsOnFileMove.enabled": "always",
+  "java.configuration.updateBuildConfiguration": "disabled"
 }
diff --git a/App.tsx b/App.tsx
@@ -1,4 +1,3 @@
-import * as Sentry from '@sentry/react-native';
 import { LogBox, Platform, UIManager } from 'react-native';
 import React, { ReactElement, useEffect } from 'react';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
@@ -16,6 +15,7 @@ import { customTheme } from './src/navigation/themes';
 import Navigator from './src/navigation/Navigator';
 import { persistor, store } from './src/store/store';
 import NotificationHandler from 'src/hooks/useNotificationHandler';
+import { SentryWrapper } from 'src/services/sentry';
 
 LogBox.ignoreLogs([
   "[react-native-gesture-handler] Seems like you're using an old API with gesture components, check out new Gestures system!",
@@ -74,6 +74,6 @@ function AppWrapper() {
   );
 }
 
-const SentryApp = Sentry.wrap(AppWrapper);
+const SentryApp = SentryWrapper(AppWrapper);
 
 export default withIAPContext(SentryApp);
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -86,8 +86,8 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 421
-        versionName "1.2.20"
+        versionCode 428
+        versionName "1.3.0"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
         multiDexEnabled true

diff --git a/android/app/src/development/res/values/strings.xml b/android/app/src/development/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">Keeper</string>
     <string name="backup_with_keeper_scheme">keeperdev</string>
+    <string name="deep_link_prefix">/app/dev</string>
 </resources>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -64,7 +64,7 @@
           <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="https" />
             <data android:host="bitcoinkeeper.app" />
-            <data android:pathPrefix="/app/prod" /> 
+            <data android:pathPrefix="@string/deep_link_prefix" /> 
         </intent-filter>
       </activity>
       <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -3,4 +3,5 @@
     <string name="backup_with_keeper_scheme">keeper</string>
     <string name="backup_with_keeper">Backup with Keeper</string>
     <string name="aiddescription">aiddescription</string>
+    <string name="deep_link_prefix">/app/prod</string>
 </resources>
diff --git a/index.js b/index.js
@@ -10,7 +10,9 @@ import { Text, Input } from 'native-base';
 import App from './App';
 import { name as appName } from './app.json';
 import { enableAndroidFontFix } from './AndroidFontFix';
+import { initSentrySDK } from 'src/services/sentry';
 
+initSentrySDK();
 enableAndroidFontFix();
 
 Text.defaultProps = Text.defaultProps || {};

diff --git a/ios/hexa_keeper.xcodeproj/project.pbxproj b/ios/hexa_keeper.xcodeproj/project.pbxproj
@@ -791,7 +791,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 421;
+				CURRENT_PROJECT_VERSION = 428;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -892,7 +892,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.2.20;
+				MARKETING_VERSION = 1.3.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -916,7 +916,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: Bithyve UK Ltd (Y5TCB759QL)";
-				CURRENT_PROJECT_VERSION = 421;
+				CURRENT_PROJECT_VERSION = 428;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
@@ -1017,7 +1017,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.2.20;
+				MARKETING_VERSION = 1.3.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1172,7 +1172,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 421;
+				CURRENT_PROJECT_VERSION = 428;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1274,7 +1274,7 @@
 					"$(PROJECT_DIR)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.2.20;
+				MARKETING_VERSION = 1.3.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1300,7 +1300,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 421;
+				CURRENT_PROJECT_VERSION = 428;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
@@ -1402,7 +1402,7 @@
 					"$(PROJECT_DIR)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.2.20;
+				MARKETING_VERSION = 1.3.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/ios/hexa_keeper/Info.plist b/ios/hexa_keeper/Info.plist
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>421</string>
+	<string>428</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NFCReaderUsageDescription</key>

diff --git a/ios/hexa_keeperTests/Info.plist b/ios/hexa_keeperTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>421</string>
+	<string>428</string>
 </dict>
 </plist>
diff --git a/ios/hexa_keeper_dev-Info.plist b/ios/hexa_keeper_dev-Info.plist
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>421</string>
+	<string>428</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NFCReaderUsageDescription</key>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexa_keeper",
-  "version": "1.2.20",
+  "version": "1.3.0",
   "private": true,
   "scripts": {
     "ios": "react-native run-ios",
@@ -24,27 +24,23 @@
     "release ios prod": "cd ios && ENVFILE=.env.production bundle exec fastlane live --env production"
   },
   "dependencies": {
+    "@bitcoinerlab/miniscript": "1.4.0",
     "@ngraveio/bc-ur": "1.1.6",
     "@noble/secp256k1": "1.6.3",
     "@react-native-community/clipboard": "1.5.1",
     "@react-native-firebase/app": "14.11.1",
     "@react-native-firebase/messaging": "14.11.1",
-    "@react-navigation/bottom-tabs": "6.5.7",
-    "@react-navigation/drawer": "6.6.6",
     "@react-navigation/native": "6.0.8",
     "@react-navigation/native-stack": "6.5.0",
     "@realm/react": "0.5.2",
-    "@redux-devtools/extension": "3.2.2",
     "@reduxjs/toolkit": "1.8.2",
     "@sentry/react-native": "5.33.1",
-    "@shipt/segmented-arc-for-react-native": "^1.0.1",
+    "@shipt/segmented-arc-for-react-native": "1.2.1",
     "@testing-library/react-native": "11.0.0",
-    "@types/crypto-js": "4.1.1",
     "assert": "2.0.0",
     "axios": "1.6.8",
-    "base58check": "^2.0.0",
+    "base58check": "2.0.0",
     "bip21": "2.0.3",
-    "bip32-path": "0.4.2",
     "bip39": "3.0.4",
     "bitcoinjs-lib": "6.1.5",
     "bitcoinjs-message": "2.2.0",
@@ -57,7 +53,7 @@
     "crypto-js": "4.2.0",
     "deprecated-react-native-prop-types": "4.2.1",
     "ecpair": "2.0.1",
-    "electrum-client": "git+https://github.com/bithyve/rn-electrum-client.git",
+    "electrum-client": "git+https://github.com/bithyve/rn-electrum-client.git#76c0ea35e1a50c47f3a7f818d529ebd100161496",
     "events": "1.0.0",
     "idx": "2.5.6",
     "lodash": "4.17.21",
@@ -75,20 +71,20 @@
     "react-native-blob-util": "0.18.3",
     "react-native-camera": "4.2.1",
     "react-native-config": "1.4.6",
-    "react-native-contacts": "^7.0.8",
+    "react-native-contacts": "7.0.8",
     "react-native-crypto": "2.2.0",
     "react-native-device-info": "10.0.2",
     "react-native-document-picker": "8.2.2",
     "react-native-fs": "2.20.0",
     "react-native-gesture-handler": "2.14.0",
     "react-native-get-random-values": "1.8.0",
-    "react-native-gifted-charts": "^1.4.7",
+    "react-native-gifted-charts": "1.4.15",
     "react-native-hce": "0.2.0",
     "react-native-html-to-pdf": "0.12.0",
     "react-native-iap": "12.15.2",
     "react-native-image-picker": "4.10.3",
     "react-native-keychain": "8.1.2",
-    "react-native-linear-gradient": "^2.8.3",
+    "react-native-linear-gradient": "2.8.3",
     "react-native-localize": "2.2.2",
     "react-native-mmkv": "2.11.0",
     "react-native-modal": "13.0.1",
@@ -99,7 +95,7 @@
     "react-native-randombytes": "3.6.1",
     "react-native-reanimated": "3.6.1",
     "react-native-responsive-screen": "1.4.2",
-    "react-native-rsa-native": "^2.0.5",
+    "react-native-rsa-native": "2.0.5",
     "react-native-safe-area-context": "4.7.2",
     "react-native-screens": "3.25.0",
     "react-native-send-intent": "1.3.0",
@@ -124,45 +120,45 @@
     "libportal-react-native": "git+https://github.com/bithyve/libportal-react-native.git#3f9373785265f3e18218eefb8958109feec8f7c3"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.0",
-    "@babel/preset-env": "^7.20.0",
-    "@babel/runtime": "^7.20.0",
-    "@react-native/eslint-config": "^0.72.2",
-    "@react-native/metro-config": "^0.72.0",
-    "@testing-library/jest-native": "^5.3.0",
-    "@tsconfig/react-native": "^3.0.0",
-    "@types/jest": "^29.2.1",
-    "@types/react": "^18.0.24",
-    "@types/react-native": "^0.66.15",
-    "@types/react-test-renderer": "^18.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.15.0",
-    "@typescript-eslint/parser": "^5.15.0",
-    "babel-jest": "^29.2.1",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "eslint": "^8.19.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-typescript": "^3.5.2",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "^7.29.4",
-    "eslint-plugin-react-hooks": "^4.3.0",
-    "eslint-plugin-react-native": "^4.0.0",
-    "husky": "^8.0.2",
-    "jest": "^29.2.1",
-    "lint-staged": "^13.0.4",
-    "metro-react-native-babel-preset": "^0.76.5",
-    "prettier": "^2.4.1",
-    "react-native-codegen": "^0.70.7",
-    "react-native-svg-transformer": "^1.1.0",
-    "react-test-renderer": "18.2.0",
-    "redux-mock-store": "^1.5.4",
-    "rn-nodeify": "github:tradle/rn-nodeify",
+    "@babel/core": "7.26.0",
+    "@babel/preset-env": "7.26.0",
+    "@babel/runtime": "7.26.0",
+    "@react-native/eslint-config": "0.72.2",
+    "@react-native/metro-config": "0.72.12",
+    "@testing-library/jest-native": "5.4.3",
+    "@tsconfig/react-native": "3.0.5",
+    "@types/jest": "29.5.14",
+    "@types/react": "18.3.12",
+    "@types/react-native": "0.66.34",
+    "@types/react-test-renderer": "18.3.0",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
+    "babel-jest": "29.7.0",
+    "babel-plugin-module-resolver": "4.1.0",
+    "babel-plugin-transform-remove-console": "6.9.4",
+    "eslint": "8.57.1",
+    "eslint-config-airbnb": "19.0.4",
+    "eslint-config-prettier": "8.10.0",
+    "eslint-import-resolver-typescript": "3.6.3",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-jsx-a11y": "6.10.2",
+    "eslint-plugin-react": "7.37.2",
+    "eslint-plugin-react-hooks": "4.6.2",
+    "eslint-plugin-react-native": "4.1.0",
+    "husky": "8.0.3",
+    "jest": "29.7.0",
+    "lint-staged": "13.3.0",
+    "metro-react-native-babel-preset": "0.76.9",
+    "prettier": "2.8.8",
+    "react-native-codegen": "0.70.7",
+    "react-native-svg-transformer": "1.5.0",
+    "react-test-renderer": "18.3.0",
+    "redux-mock-store": "1.5.5",
+    "rn-nodeify": "github:tradle/rn-nodeify#338d8d6ba8438403093e9409e9a9d88ad884926f",
     "typescript": "4.8.4"
   },
   "resolutions": {
-    "@types/react": "^17"
+    "@types/react": "18.3.12"
   },
   "react-native": {
     "crypto": "react-native-crypto",

diff --git a/src/assets/images/add-circle-light.svg b/src/assets/images/add-circle-light.svg
diff --git a/src/assets/images/assisted-vault-disabled-icon.svg b/src/assets/images/assisted-vault-disabled-icon.svg
diff --git a/src/assets/images/assisted-vault-hexa.svg b/src/assets/images/assisted-vault-hexa.svg