diff --git a/android/app/build.gradle b/android/app/build.gradle index fc31b9961..e0944fa0b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,12 +149,12 @@ android { } dependencies { - compile project(':react-native-webview') + compile project(':react-native-svg') compile project(':react-native-camera') + compile project(':react-native-webview') compile project(':react-native-fs') compile project(':react-native-gesture-handler') compile project(':react-native-vector-icons') - compile project(':react-native-svg') compile project(':react-native-sentry') compile project(':react-native-randombytes') compile project(':react-native-prompt-android') diff --git a/android/app/src/main/java/com/bluewallet/MainApplication.java b/android/app/src/main/java/com/bluewallet/MainApplication.java index 667c0f131..e3a532221 100644 --- a/android/app/src/main/java/com/bluewallet/MainApplication.java +++ b/android/app/src/main/java/com/bluewallet/MainApplication.java @@ -3,9 +3,10 @@ package io.bluewallet.bluewallet; import android.app.Application; import com.facebook.react.ReactApplication; +import com.horcrux.svg.SvgPackage; +import org.reactnative.camera.RNCameraPackage; import com.reactnativecommunity.webview.RNCWebViewPackage; import com.oblador.vectoricons.VectorIconsPackage; -import com.horcrux.svg.SvgPackage; import io.sentry.RNSentryPackage; import com.bitgo.randombytes.RandomBytesPackage; import im.shimo.react.prompt.RNPromptPackage; @@ -17,7 +18,6 @@ import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; import com.facebook.soloader.SoLoader; -import org.reactnative.camera.RNCameraPackage; import com.swmansion.gesturehandler.react.RNGestureHandlerPackage; import com.rnfs.RNFSPackage; @@ -36,10 +36,11 @@ public class MainApplication extends Application implements ReactApplication { protected List getPackages() { return Arrays.asList( new MainReactPackage(), + new SvgPackage(), + new RNCameraPackage(), new RNCWebViewPackage(), new RNFSPackage() , new VectorIconsPackage(), - new SvgPackage(), new RNSentryPackage(), new RandomBytesPackage(), new RNPromptPackage(), diff --git a/android/settings.gradle b/android/settings.gradle index 11636f24e..b22f77f4f 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,16 +1,16 @@ rootProject.name = 'BlueWallet' -include ':react-native-webview' -project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android') +include ':react-native-svg' +project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android') include ':react-native-camera' project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android') +include ':react-native-webview' +project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android') include ':react-native-fs' project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android') include ':react-native-gesture-handler' project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android') include ':react-native-vector-icons' project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') -include ':react-native-svg' -project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android') include ':react-native-sentry' project(':react-native-sentry').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sentry/android') include ':react-native-randombytes' diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj index 253aeedb3..0db0aa60f 100644 --- a/ios/BlueWallet.xcodeproj/project.pbxproj +++ b/ios/BlueWallet.xcodeproj/project.pbxproj @@ -5,6 +5,7 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; @@ -47,33 +48,33 @@ 3ED26B1105834E44AECC99CE /* libRNRandomBytes-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B0661D5EE994C5887A656CC /* libRNRandomBytes-tvOS.a */; }; 4A9494D3A1E04115B6F7D0D4 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1B3AD816E1A646799CA4E452 /* Ionicons.ttf */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; + 61EAF294EE4B4CB29657DB9B /* libRNSVG.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BA37215528B485A90FB1A0F /* libRNSVG.a */; }; 6A95349CF0194548A175076B /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B5DED491BF6C49AE8AC4F530 /* Entypo.ttf */; }; 6FEBC8E7AA7D4744A2EEE87B /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 01B7B7DF17B84765BE45F7F1 /* libRNGestureHandler.a */; }; - 79A0163DC7B34D1D8E4B6944 /* libRNSVG-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6553F26980BC47409FFB0F7C /* libRNSVG-tvOS.a */; }; 7C1B264BF28B44C29BA00262 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5ED20A6C018043AE8185DD19 /* EvilIcons.ttf */; }; 7C76B2A54AF3405FB041001E /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9BD18677AAD543C79A7CB577 /* FontAwesome.ttf */; }; 7C83851C74EC41958D6AE8C6 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D914576230A34EF598917FA9 /* Zocial.ttf */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; 96CC4BF79B174A478DF9C378 /* libRNVectorIcons-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CC4FCEA18F7E4033B6EF3D70 /* libRNVectorIcons-tvOS.a */; }; + 9C8A04EAD6B34957BFF931B3 /* libRNSVG-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57CC4BC34B37469B91E13903 /* libRNSVG-tvOS.a */; }; 9F810B06D93D45B983F70B74 /* libRNSentry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A6242DF4B645AAB539D2E4 /* libRNSentry.a */; }; A00EA31D54E74AB4BABF8755 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4C1AD00A4FDD42BEB62AFCF5 /* FontAwesome5_Brands.ttf */; }; A89DFA8A97B642D0AFD63AA2 /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96C3F4E26841456EBF625D82 /* libRNDeviceInfo-tvOS.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; + B4C5B89D21F2B85E00A845C4 /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B4C5B89C21F2B74300A845C4 /* libRNCWebView.a */; }; B86E02D094DF455C990432D2 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BD7B6C6FFF1E4646860703CA /* Foundation.ttf */; }; - C031BDE1E9544216A73A4321 /* libRNSVG.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6037CD1CCED34A7E980149E6 /* libRNSVG.a */; }; CB65331B95F8467390AC8BF0 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F84697F33A394B419D56ED30 /* libRNVectorIcons.a */; }; D37B51DB221D47B7996BE00D /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F9FC88F4A85F40E9ABACACB9 /* Octicons.ttf */; }; + DB5F6867C0D24ADA820BA62E /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A8DD416BB0204310950E4791 /* libRNCamera.a */; }; E276BE46B82249E1B88A99C8 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD69D8473C341528160682A /* libsqlite3.0.tbd */; }; E4BBBC2D6D394E89B99A5C16 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D124361914C041219D903C3D /* SimpleLineIcons.ttf */; }; E98E21D32735429C8E630B54 /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 97EF095ACCA1462FA6012B97 /* AntDesign.ttf */; }; EA537EBFD04A4EEBA3D7166F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CCDBD1516FF4AD492C1226C /* SystemConfiguration.framework */; }; EDC6FF8621D64E31924EDC57 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = C2433A8567374E78ACA76F08 /* libz.tbd */; }; F0182C8D1F194D66AA25FCFC /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B2AB1C624E24C1BA95FBFED /* libBVLinearGradient.a */; }; - F439E4EEAE42446B8AE33E3F /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F5B1CA51964493093282D8E /* libRNCamera.a */; }; F6AA297664414342AC23B529 /* libRNFS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F9F01E9C22C243A9AB48A90A /* libRNFS.a */; }; F97F051969164CCBA5336FC2 /* libRNRandomBytes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 907C87020BD04956A5253DEB /* libRNRandomBytes.a */; }; FDE69393B0DE46149DDB7E3C /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C0708F2D346B415C84383510 /* FontAwesome5_Solid.ttf */; }; - 062DB9F45136428EB8FB7336 /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C58B5DBFA404AB19769C5BB /* libRNCWebView.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -392,20 +393,6 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RNSentry; }; - B48F210E219E8A0800BA10A8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C88A48E1C11140418478EC7F /* RNSVG.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0CF68AC11AF0540F00FF9E5C; - remoteInfo = RNSVG; - }; - B48F2110219E8A0800BA10A8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C88A48E1C11140418478EC7F /* RNSVG.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 94DDAC5C1F3D024300EED511; - remoteInfo = "RNSVG-tvOS"; - }; B48F2114219E8A0800BA10A8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CF14D1AA406D4EDC85D3A61F /* RNVectorIcons.xcodeproj */; @@ -448,6 +435,34 @@ remoteGlobalIDString = 163CDE4E2087CAD3001065FB; remoteInfo = "RNRandomBytes-tvOS"; }; + B4C5B88E21F2B74300A845C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A658B027955F41D2BF4E5EC6 /* RNCamera.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 4107012F1ACB723B00C6AA39; + remoteInfo = RNCamera; + }; + B4C5B89421F2B74300A845C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C284AE4814254A8BAFD9DB3F /* RNSVG.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 0CF68AC11AF0540F00FF9E5C; + remoteInfo = RNSVG; + }; + B4C5B89621F2B74300A845C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C284AE4814254A8BAFD9DB3F /* RNSVG.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 94DDAC5C1F3D024300EED511; + remoteInfo = "RNSVG-tvOS"; + }; + B4C5B89B21F2B74300A845C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DFF25437693E405A85D106D4 /* RNCWebView.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 134814201AA4EA6300B7C361; + remoteInfo = RNCWebView; + }; B4CE842321B4C0DD00E2E2A3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C0B6F9440F69425886845061 /* RNFS.xcodeproj */; @@ -469,13 +484,6 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RNGestureHandler; }; - B4F3B4F421A906D000548A69 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7F7225A9F01C4785B27FF490 /* RNCamera.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4107012F1ACB723B00C6AA39; - remoteInfo = RNCamera; - }; B4F7F05921E8449B00AFD87C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D6051C6440444360BD29AFE4 /* RNRate.xcodeproj */; @@ -522,18 +530,16 @@ 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 2DD69D8473C341528160682A /* libsqlite3.0.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; }; 3B2AB1C624E24C1BA95FBFED /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBVLinearGradient.a; sourceTree = ""; }; - 3F5B1CA51964493093282D8E /* libRNCamera.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCamera.a; sourceTree = ""; }; 4B0661D5EE994C5887A656CC /* libRNRandomBytes-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNRandomBytes-tvOS.a"; sourceTree = ""; }; 4C1AD00A4FDD42BEB62AFCF5 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; 51A88773DE2A456AA13E1814 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; + 57CC4BC34B37469B91E13903 /* libRNSVG-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNSVG-tvOS.a"; sourceTree = ""; }; 5863F2E7B71740E3940BABD9 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = ""; }; + 5C58B5DBFA404AB19769C5BB /* libRNCWebView.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCWebView.a; sourceTree = ""; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 5ED20A6C018043AE8185DD19 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; - 6037CD1CCED34A7E980149E6 /* libRNSVG.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSVG.a; sourceTree = ""; }; - 6553F26980BC47409FFB0F7C /* libRNSVG-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNSVG-tvOS.a"; sourceTree = ""; }; 6CCDBD1516FF4AD492C1226C /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; - 7F7225A9F01C4785B27FF490 /* RNCamera.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCamera.xcodeproj; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; 87703C68A1014D0A8FDBAD00 /* RCTGoogleAnalyticsBridge.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTGoogleAnalyticsBridge.xcodeproj; path = "../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/RCTGoogleAnalyticsBridge.xcodeproj"; sourceTree = ""; }; 8C242FC657494F7FB41321D9 /* libRNAmplitudeSDK.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNAmplitudeSDK.a; sourceTree = ""; }; @@ -543,8 +549,11 @@ 917199AF101244F5A9119C8C /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = ""; }; 96C3F4E26841456EBF625D82 /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNDeviceInfo-tvOS.a"; sourceTree = ""; }; 97EF095ACCA1462FA6012B97 /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; }; + 9BA37215528B485A90FB1A0F /* libRNSVG.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSVG.a; sourceTree = ""; }; 9BD18677AAD543C79A7CB577 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; 9FF3B2695A6A43B39CE4D2AF /* libReactNativePermissions.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativePermissions.a; sourceTree = ""; }; + A658B027955F41D2BF4E5EC6 /* RNCamera.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCamera.xcodeproj; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = ""; }; + A8DD416BB0204310950E4791 /* libRNCamera.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCamera.a; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; B5A6242DF4B645AAB539D2E4 /* libRNSentry.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSentry.a; sourceTree = ""; }; B5DED491BF6C49AE8AC4F530 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; @@ -552,7 +561,7 @@ C0708F2D346B415C84383510 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; C0B6F9440F69425886845061 /* RNFS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFS.xcodeproj; path = "../node_modules/react-native-fs/RNFS.xcodeproj"; sourceTree = ""; }; C2433A8567374E78ACA76F08 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - C88A48E1C11140418478EC7F /* RNSVG.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSVG.xcodeproj; path = "../node_modules/react-native-svg/ios/RNSVG.xcodeproj"; sourceTree = ""; }; + C284AE4814254A8BAFD9DB3F /* RNSVG.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSVG.xcodeproj; path = "../node_modules/react-native-svg/ios/RNSVG.xcodeproj"; sourceTree = ""; }; C979953B425248FEA80F4F78 /* libRNReactNativeHapticFeedback.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNReactNativeHapticFeedback.a; sourceTree = ""; }; CA35307CBA624D81A15815D2 /* RNReactNativeHapticFeedback.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNReactNativeHapticFeedback.xcodeproj; path = "../node_modules/react-native-haptic-feedback/ios/RNReactNativeHapticFeedback.xcodeproj"; sourceTree = ""; }; CC4FCEA18F7E4033B6EF3D70 /* libRNVectorIcons-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNVectorIcons-tvOS.a"; sourceTree = ""; }; @@ -564,6 +573,7 @@ DAC908621D184867839621FE /* RNGestureHandler.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNGestureHandler.xcodeproj; path = "../node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj"; sourceTree = ""; }; DB512F57589B4F8A89CBE2AB /* RNRandomBytes.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNRandomBytes.xcodeproj; path = "../node_modules/react-native-randombytes/RNRandomBytes.xcodeproj"; sourceTree = ""; }; DDABC336B13E47398005736D /* RNSentry.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSentry.xcodeproj; path = "../node_modules/react-native-sentry/ios/RNSentry.xcodeproj"; sourceTree = ""; }; + DFF25437693E405A85D106D4 /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCWebView.xcodeproj; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = ""; }; ED0418953CCE4F4FA0E0E60F /* libRNRate.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNRate.a; sourceTree = ""; }; F01CC934C46A40A19F1F8861 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; F13B02B9DD2A4068B8201EAB /* libRCTCamera.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTCamera.a; sourceTree = ""; }; @@ -571,8 +581,6 @@ F9F01E9C22C243A9AB48A90A /* libRNFS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFS.a; sourceTree = ""; }; F9FC88F4A85F40E9ABACACB9 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; FDDDD64DF1014CDE82A5D7D9 /* ReactNativePermissions.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativePermissions.xcodeproj; path = "../node_modules/react-native-permissions/ios/ReactNativePermissions.xcodeproj"; sourceTree = ""; }; - DFF25437693E405A85D106D4 /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; name = "RNCWebView.xcodeproj"; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; - 5C58B5DBFA404AB19769C5BB /* libRNCWebView.a */ = {isa = PBXFileReference; name = "libRNCWebView.a"; path = "libRNCWebView.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -588,6 +596,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B4C5B89D21F2B85E00A845C4 /* libRNCWebView.a in Frameworks */, ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, @@ -610,15 +619,14 @@ E276BE46B82249E1B88A99C8 /* libsqlite3.0.tbd in Frameworks */, 050943495F6A45DF961C7596 /* libRNReactNativeHapticFeedback.a in Frameworks */, 1EF9306F31DC4D469F615F52 /* libReactNativePermissions.a in Frameworks */, - C031BDE1E9544216A73A4321 /* libRNSVG.a in Frameworks */, CB65331B95F8467390AC8BF0 /* libRNVectorIcons.a in Frameworks */, F0182C8D1F194D66AA25FCFC /* libBVLinearGradient.a in Frameworks */, F97F051969164CCBA5336FC2 /* libRNRandomBytes.a in Frameworks */, 6FEBC8E7AA7D4744A2EEE87B /* libRNGestureHandler.a in Frameworks */, - F439E4EEAE42446B8AE33E3F /* libRNCamera.a in Frameworks */, F6AA297664414342AC23B529 /* libRNFS.a in Frameworks */, 228DCD6BAF1B4DF181C5A307 /* libRNRate.a in Frameworks */, - 062DB9F45136428EB8FB7336 /* libRNCWebView.a in Frameworks */, + DB5F6867C0D24ADA820BA62E /* libRNCamera.a in Frameworks */, + 61EAF294EE4B4CB29657DB9B /* libRNSVG.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -635,9 +643,9 @@ 2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */, 2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */, A89DFA8A97B642D0AFD63AA2 /* libRNDeviceInfo-tvOS.a in Frameworks */, - 79A0163DC7B34D1D8E4B6944 /* libRNSVG-tvOS.a in Frameworks */, 96CC4BF79B174A478DF9C378 /* libRNVectorIcons-tvOS.a in Frameworks */, 3ED26B1105834E44AECC99CE /* libRNRandomBytes-tvOS.a in Frameworks */, + 9C8A04EAD6B34957BFF931B3 /* libRNSVG-tvOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -840,15 +848,15 @@ 87703C68A1014D0A8FDBAD00 /* RCTGoogleAnalyticsBridge.xcodeproj */, CA35307CBA624D81A15815D2 /* RNReactNativeHapticFeedback.xcodeproj */, FDDDD64DF1014CDE82A5D7D9 /* ReactNativePermissions.xcodeproj */, - C88A48E1C11140418478EC7F /* RNSVG.xcodeproj */, CF14D1AA406D4EDC85D3A61F /* RNVectorIcons.xcodeproj */, 5863F2E7B71740E3940BABD9 /* BVLinearGradient.xcodeproj */, DB512F57589B4F8A89CBE2AB /* RNRandomBytes.xcodeproj */, DAC908621D184867839621FE /* RNGestureHandler.xcodeproj */, - 7F7225A9F01C4785B27FF490 /* RNCamera.xcodeproj */, C0B6F9440F69425886845061 /* RNFS.xcodeproj */, D6051C6440444360BD29AFE4 /* RNRate.xcodeproj */, DFF25437693E405A85D106D4 /* RNCWebView.xcodeproj */, + A658B027955F41D2BF4E5EC6 /* RNCamera.xcodeproj */, + C284AE4814254A8BAFD9DB3F /* RNSVG.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -908,20 +916,20 @@ C979953B425248FEA80F4F78 /* libRNReactNativeHapticFeedback.a */, 9FF3B2695A6A43B39CE4D2AF /* libReactNativePermissions.a */, 0A6C0341E36446BE93133B26 /* libRNSensors.a */, - 6037CD1CCED34A7E980149E6 /* libRNSVG.a */, F84697F33A394B419D56ED30 /* libRNVectorIcons.a */, 96C3F4E26841456EBF625D82 /* libRNDeviceInfo-tvOS.a */, - 6553F26980BC47409FFB0F7C /* libRNSVG-tvOS.a */, CC4FCEA18F7E4033B6EF3D70 /* libRNVectorIcons-tvOS.a */, 3B2AB1C624E24C1BA95FBFED /* libBVLinearGradient.a */, 907C87020BD04956A5253DEB /* libRNRandomBytes.a */, 4B0661D5EE994C5887A656CC /* libRNRandomBytes-tvOS.a */, 01B7B7DF17B84765BE45F7F1 /* libRNGestureHandler.a */, - 3F5B1CA51964493093282D8E /* libRNCamera.a */, F9F01E9C22C243A9AB48A90A /* libRNFS.a */, 8CF3D00F82534DE796D11610 /* libRCTGoogleAnalyticsBridge.a */, ED0418953CCE4F4FA0E0E60F /* libRNRate.a */, - 81EDDF247D484BC38EBCE565 /* libRNCWebView.a */, + 5C58B5DBFA404AB19769C5BB /* libRNCWebView.a */, + A8DD416BB0204310950E4791 /* libRNCamera.a */, + 9BA37215528B485A90FB1A0F /* libRNSVG.a */, + 57CC4BC34B37469B91E13903 /* libRNSVG-tvOS.a */, ); name = "Recovered References"; sourceTree = ""; @@ -977,15 +985,6 @@ name = Products; sourceTree = ""; }; - B48F20EF219E8A0800BA10A8 /* Products */ = { - isa = PBXGroup; - children = ( - B48F210F219E8A0800BA10A8 /* libRNSVG.a */, - B48F2111219E8A0800BA10A8 /* libRNSVG-tvOS.a */, - ); - name = Products; - sourceTree = ""; - }; B48F215D219E918C00BA10A8 /* Products */ = { isa = PBXGroup; children = ( @@ -1004,6 +1003,31 @@ name = Products; sourceTree = ""; }; + B4C5B88B21F2B74300A845C4 /* Products */ = { + isa = PBXGroup; + children = ( + B4C5B88F21F2B74300A845C4 /* libRNCamera.a */, + ); + name = Products; + sourceTree = ""; + }; + B4C5B89021F2B74300A845C4 /* Products */ = { + isa = PBXGroup; + children = ( + B4C5B89521F2B74300A845C4 /* libRNSVG.a */, + B4C5B89721F2B74300A845C4 /* libRNSVG-tvOS.a */, + ); + name = Products; + sourceTree = ""; + }; + B4C5B89821F2B74300A845C4 /* Products */ = { + isa = PBXGroup; + children = ( + B4C5B89C21F2B74300A845C4 /* libRNCWebView.a */, + ); + name = Products; + sourceTree = ""; + }; B4CE841F21B4C0DD00E2E2A3 /* Products */ = { isa = PBXGroup; children = ( @@ -1021,14 +1045,6 @@ name = Products; sourceTree = ""; }; - B4F3B4F121A906D000548A69 /* Products */ = { - isa = PBXGroup; - children = ( - B4F3B4F521A906D000548A69 /* libRNCamera.a */, - ); - name = Products; - sourceTree = ""; - }; B4F7F05621E8449B00AFD87C /* Products */ = { isa = PBXGroup; children = ( @@ -1214,8 +1230,12 @@ ProjectRef = FDDDD64DF1014CDE82A5D7D9 /* ReactNativePermissions.xcodeproj */; }, { - ProductGroup = B4F3B4F121A906D000548A69 /* Products */; - ProjectRef = 7F7225A9F01C4785B27FF490 /* RNCamera.xcodeproj */; + ProductGroup = B4C5B88B21F2B74300A845C4 /* Products */; + ProjectRef = A658B027955F41D2BF4E5EC6 /* RNCamera.xcodeproj */; + }, + { + ProductGroup = B4C5B89821F2B74300A845C4 /* Products */; + ProjectRef = DFF25437693E405A85D106D4 /* RNCWebView.xcodeproj */; }, { ProductGroup = B48F20ED219E8A0800BA10A8 /* Products */; @@ -1246,8 +1266,8 @@ ProjectRef = DDABC336B13E47398005736D /* RNSentry.xcodeproj */; }, { - ProductGroup = B48F20EF219E8A0800BA10A8 /* Products */; - ProjectRef = C88A48E1C11140418478EC7F /* RNSVG.xcodeproj */; + ProductGroup = B4C5B89021F2B74300A845C4 /* Products */; + ProjectRef = C284AE4814254A8BAFD9DB3F /* RNSVG.xcodeproj */; }, { ProductGroup = B48F20E7219E8A0800BA10A8 /* Products */; @@ -1566,20 +1586,6 @@ remoteRef = B48F210A219E8A0800BA10A8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - B48F210F219E8A0800BA10A8 /* libRNSVG.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNSVG.a; - remoteRef = B48F210E219E8A0800BA10A8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - B48F2111219E8A0800BA10A8 /* libRNSVG-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRNSVG-tvOS.a"; - remoteRef = B48F2110219E8A0800BA10A8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; B48F2115219E8A0800BA10A8 /* libRNVectorIcons.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1622,6 +1628,34 @@ remoteRef = B48F21E7219FC5E700BA10A8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + B4C5B88F21F2B74300A845C4 /* libRNCamera.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNCamera.a; + remoteRef = B4C5B88E21F2B74300A845C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B4C5B89521F2B74300A845C4 /* libRNSVG.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNSVG.a; + remoteRef = B4C5B89421F2B74300A845C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B4C5B89721F2B74300A845C4 /* libRNSVG-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRNSVG-tvOS.a"; + remoteRef = B4C5B89621F2B74300A845C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B4C5B89C21F2B74300A845C4 /* libRNCWebView.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNCWebView.a; + remoteRef = B4C5B89B21F2B74300A845C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; B4CE842421B4C0DD00E2E2A3 /* libRNFS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1643,13 +1677,6 @@ remoteRef = B4F3B46D21A7D63400548A69 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - B4F3B4F521A906D000548A69 /* libRNCamera.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNCamera.a; - remoteRef = B4F3B4F421A906D000548A69 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; B4F7F05A21E8449B00AFD87C /* libRNRate.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1840,15 +1867,15 @@ "$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**", "$(SRCROOT)/../node_modules/react-native-haptic-feedback/ios", "$(SRCROOT)/../node_modules/react-native-permissions/ios/**", - "$(SRCROOT)/../node_modules/react-native-svg/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", "$(SRCROOT)/../node_modules/react-native-randombytes", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios/**", "$(SRCROOT)/../node_modules/react-native-fs/**", "$(SRCROOT)/../node_modules/react-native-rate/ios", "$(SRCROOT)/../node_modules/react-native-webview/ios", + "$(SRCROOT)/../node_modules/react-native-camera/ios/**", + "$(SRCROOT)/../node_modules/react-native-svg/ios/**", ); INFOPLIST_FILE = BlueWalletTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -1856,6 +1883,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1880,15 +1908,15 @@ "$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**", "$(SRCROOT)/../node_modules/react-native-haptic-feedback/ios", "$(SRCROOT)/../node_modules/react-native-permissions/ios/**", - "$(SRCROOT)/../node_modules/react-native-svg/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", "$(SRCROOT)/../node_modules/react-native-randombytes", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios/**", "$(SRCROOT)/../node_modules/react-native-fs/**", "$(SRCROOT)/../node_modules/react-native-rate/ios", "$(SRCROOT)/../node_modules/react-native-webview/ios", + "$(SRCROOT)/../node_modules/react-native-camera/ios/**", + "$(SRCROOT)/../node_modules/react-native-svg/ios/**", ); INFOPLIST_FILE = BlueWalletTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -1896,6 +1924,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1921,15 +1950,15 @@ "$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**", "$(SRCROOT)/../node_modules/react-native-haptic-feedback/ios", "$(SRCROOT)/../node_modules/react-native-permissions/ios/**", - "$(SRCROOT)/../node_modules/react-native-svg/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", "$(SRCROOT)/../node_modules/react-native-randombytes", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios/**", "$(SRCROOT)/../node_modules/react-native-fs/**", "$(SRCROOT)/../node_modules/react-native-rate/ios", "$(SRCROOT)/../node_modules/react-native-webview/ios", + "$(SRCROOT)/../node_modules/react-native-camera/ios/**", + "$(SRCROOT)/../node_modules/react-native-svg/ios/**", ); INFOPLIST_FILE = BlueWallet/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; @@ -1960,15 +1989,15 @@ "$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**", "$(SRCROOT)/../node_modules/react-native-haptic-feedback/ios", "$(SRCROOT)/../node_modules/react-native-permissions/ios/**", - "$(SRCROOT)/../node_modules/react-native-svg/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", "$(SRCROOT)/../node_modules/react-native-randombytes", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios/**", "$(SRCROOT)/../node_modules/react-native-fs/**", "$(SRCROOT)/../node_modules/react-native-rate/ios", "$(SRCROOT)/../node_modules/react-native-webview/ios", + "$(SRCROOT)/../node_modules/react-native-camera/ios/**", + "$(SRCROOT)/../node_modules/react-native-svg/ios/**", ); INFOPLIST_FILE = BlueWallet/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; @@ -2005,21 +2034,22 @@ "$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**", "$(SRCROOT)/../node_modules/react-native-haptic-feedback/ios", "$(SRCROOT)/../node_modules/react-native-permissions/ios/**", - "$(SRCROOT)/../node_modules/react-native-svg/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", "$(SRCROOT)/../node_modules/react-native-randombytes", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios/**", "$(SRCROOT)/../node_modules/react-native-fs/**", "$(SRCROOT)/../node_modules/react-native-rate/ios", "$(SRCROOT)/../node_modules/react-native-webview/ios", + "$(SRCROOT)/../node_modules/react-native-camera/ios/**", + "$(SRCROOT)/../node_modules/react-native-svg/ios/**", ); INFOPLIST_FILE = "BlueWallet-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2053,21 +2083,22 @@ "$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**", "$(SRCROOT)/../node_modules/react-native-haptic-feedback/ios", "$(SRCROOT)/../node_modules/react-native-permissions/ios/**", - "$(SRCROOT)/../node_modules/react-native-svg/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", "$(SRCROOT)/../node_modules/react-native-randombytes", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios/**", "$(SRCROOT)/../node_modules/react-native-fs/**", "$(SRCROOT)/../node_modules/react-native-rate/ios", "$(SRCROOT)/../node_modules/react-native-webview/ios", + "$(SRCROOT)/../node_modules/react-native-camera/ios/**", + "$(SRCROOT)/../node_modules/react-native-svg/ios/**", ); INFOPLIST_FILE = "BlueWallet-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2100,21 +2131,22 @@ "$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**", "$(SRCROOT)/../node_modules/react-native-haptic-feedback/ios", "$(SRCROOT)/../node_modules/react-native-permissions/ios/**", - "$(SRCROOT)/../node_modules/react-native-svg/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", "$(SRCROOT)/../node_modules/react-native-randombytes", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios/**", "$(SRCROOT)/../node_modules/react-native-fs/**", "$(SRCROOT)/../node_modules/react-native-rate/ios", "$(SRCROOT)/../node_modules/react-native-webview/ios", + "$(SRCROOT)/../node_modules/react-native-camera/ios/**", + "$(SRCROOT)/../node_modules/react-native-svg/ios/**", ); INFOPLIST_FILE = "BlueWallet-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2147,21 +2179,22 @@ "$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**", "$(SRCROOT)/../node_modules/react-native-haptic-feedback/ios", "$(SRCROOT)/../node_modules/react-native-permissions/ios/**", - "$(SRCROOT)/../node_modules/react-native-svg/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", "$(SRCROOT)/../node_modules/react-native-randombytes", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios/**", "$(SRCROOT)/../node_modules/react-native-fs/**", "$(SRCROOT)/../node_modules/react-native-rate/ios", "$(SRCROOT)/../node_modules/react-native-webview/ios", + "$(SRCROOT)/../node_modules/react-native-camera/ios/**", + "$(SRCROOT)/../node_modules/react-native-svg/ios/**", ); INFOPLIST_FILE = "BlueWallet-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/package-lock.json b/package-lock.json index be1bfea06..f14c13bdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9124,9 +9124,9 @@ } }, "react-native-device-info": { - "version": "0.24.3", - "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-0.24.3.tgz", - "integrity": "sha512-usW00Wk6DoXH1eRSMt07j0uYvuka3SIEnJ9girlddAacyqwfa1QMVTN4eYmtaBzuMd/avhis8iHZQ3cLaR9CMA==" + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-0.25.0.tgz", + "integrity": "sha512-5egYoRhO6OE4VHC2RZtjNYxuXtwR2oexoI1GwvAiYzyGEc2pkMaC59xN2W0NX0mDxhkfaDsMzc+WArLqSg62xA==" }, "react-native-elements": { "version": "0.19.1", diff --git a/package.json b/package.json index ebb72a7db..54f3653f0 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "react-native": "^0.57.8", "react-native-camera": "^1.8.0", "react-native-custom-qr-codes": "^2.0.0", - "react-native-device-info": "^0.24.3", + "react-native-device-info": "^0.25.0", "react-native-elements": "^0.19.0", "react-native-flexi-radio-button": "^0.2.2", "react-native-fs": "^2.13.3", @@ -89,7 +89,6 @@ "request-promise-native": "^1.0.5", "secure-random": "^1.1.1", "stream-browserify": "^1.0.0", - "util": "^0.10.4", "wif": "^2.0.1" }, "react-native": { diff --git a/screen/lnd/browser.js b/screen/lnd/browser.js index 961d9c804..4177fb34a 100644 --- a/screen/lnd/browser.js +++ b/screen/lnd/browser.js @@ -385,6 +385,7 @@ export default class Browser extends Component { console.log('load end'); this.setState({ url: e.nativeEvent.url, pageIsLoading: false }); }} + injectJavaScript={injectedParadise} onLoadProgress={e => { console.log('progress:', e.nativeEvent.progress); if (!alreadyInjected && e.nativeEvent.progress > 0.5) { @@ -393,6 +394,7 @@ export default class Browser extends Component { console.log('injected'); } }} + /> );