Fixed crash

dcentrica · Jan 19, 2019 · 577b560 · 577b560
1 parent 1a8eebd
commit 577b560
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 113 deletions.
diff --git 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
@@ -3,9 +3,10 @@
 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.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 boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>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
@@ -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
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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');
             }
           }}
+
         />
       </SafeBlueArea>
     );