Merge remote-tracking branch 'origin/master' into react-native-upgrade

# Conflicts: # ios/Podfile.lock # ios/bitkit.xcodeproj/project.pbxproj # package.json
marscoin · Apr 21, 2023 · 7dfcb42 · 7dfcb42
2 parents 6efea22 + ea346d6
commit 7dfcb42
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,7 +98,7 @@ android {
         applicationId "to.synonym.bitkit.wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 39
+        versionCode 43
         versionName "1.0"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -348,7 +348,7 @@ PODS:
     - React-Core
   - react-native-image-picker (5.3.1):
     - React-Core
-  - react-native-ldk (0.0.88):
+  - react-native-ldk (0.0.89):
     - React
   - react-native-libsodium (0.7.0):
     - React-Core
@@ -835,8 +835,8 @@ SPEC CHECKSUMS:
   react-native-document-picker: 495c444c0c773c6e83a5d91165890ecb1c0a399a
   react-native-flipper: fe6db6651d338f516899ebe8dad573d0f2d7aa76
   react-native-image-picker: ec9b713e248760bfa0f879f0715391de4651a7cb
-  react-native-ldk: e9021dac38a9b02194df3b409f4baed69f114b3c
-  react-native-libsodium: 2834a805c906aef4b7609019bcc87e7d9eb86b23
+  react-native-ldk: 58ed077970033a7017a290b4a5ec6189c70ebb08
+  react-native-libsodium: f4eba037c4ddf73f86b08075452cacb957256147
   react-native-mmkv: 7da5e18e55c04a9af9a7e0ab9792a1e8d33765a1
   react-native-netinfo: 22c082970cbd99071a4e5aa7a612ac20d66b08f0
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846

diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj
@@ -556,7 +556,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 43;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = bitkit/Info.plist;
@@ -587,7 +587,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 43;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = bitkit/Info.plist;

diff --git a/package.json b/package.json
@@ -50,8 +50,8 @@
     "@reduxjs/toolkit": "^1.9.3",
     "@shopify/react-native-skia": "0.1.182",
     "@synonymdev/blocktank-client": "0.0.50",
-    "@synonymdev/react-native-ldk": "0.0.88",
-    "@synonymdev/react-native-lnurl": "^0.0.3",
+    "@synonymdev/react-native-ldk": "^0.0.89",
+    "@synonymdev/react-native-lnurl": "0.0.3",
     "@synonymdev/result": "0.0.2",
     "@synonymdev/slashtags-auth": "^1.0.0-alpha.5",
     "@synonymdev/slashtags-sdk": "1.0.0-alpha.38",

diff --git a/yarn.lock b/yarn.lock
@@ -2408,10 +2408,10 @@
     cross-fetch "^3.1.4"
     node-fetch "3.1.1"
 
-"@synonymdev/react-native-ldk@0.0.88":
-  version "0.0.88"
-  resolved "https://registry.yarnpkg.com/@synonymdev/react-native-ldk/-/react-native-ldk-0.0.88.tgz#c041e5b9cddcdd2ae330d14097a55f5c0faa807d"
-  integrity sha512-j0Un/5Cl9xnAmCVYO//BxGwNK0+tpUHgqstrLq3wM8hm/mZmCIWMYTtvY9J1OhIYBLP1ASfFGydyM8Rq9BO5bA==
+"@synonymdev/react-native-ldk@^0.0.89":
+  version "0.0.89"
+  resolved "https://registry.yarnpkg.com/@synonymdev/react-native-ldk/-/react-native-ldk-0.0.89.tgz#82956436011cc575e893422e12469a298bf214b2"
+  integrity sha512-AAfnVM3AEGkoJaSNcbtjLd3Xnfx/87Jj1owETB2fY77f2bw4rFFsgoQyge6OfsHst5xlpohCqVmTVzzcH6J0Sg==
   dependencies:
     bitcoinjs-lib "^6.0.2"