iOS fixes

brunobar79 · Dec 16, 2018 · 1ec7a87 · 1ec7a87
1 parent aafa762
commit 1ec7a87
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Web3Webview.ios.js b/Web3Webview.ios.js
@@ -444,11 +444,11 @@ class Web3Webview extends React.Component {
 				injectedJavaScriptForMainFrameOnly={
 					this.props.injectedJavaScriptForMainFrameOnly
 				}
-				injectJavaScript={this.props.injectJavaScript}
-				injectedJavaScript={
-					this.props.injectedJavaScript ||
+				injectJavaScript={
+					this.props.injectJavaScript ||
 					this.props.injectedOnStartLoadingJavaScript
 				}
+				injectedJavaScript={ this.props.injectedJavaScript }
 				bounces={this.props.bounces}
 				scrollEnabled={this.props.scrollEnabled}
 				contentInset={this.props.contentInset}

diff --git a/ios/RNWeb3Webview.m b/ios/RNWeb3Webview.m
@@ -307,7 +307,13 @@ - (BOOL)canGoForward
 
 - (void)reload
 {
-  [_webView reload];
+    NSURLRequest *request = [RCTConvert NSURLRequest:self.source];
+    if (request.URL && !_webView.URL.absoluteString.length) {
+        [self loadRequest:request];
+    }
+    else {
+        [_webView reload];
+    }
 }
 
 - (void)stopLoading

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-web3-webview",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A react native webview optimized for a web3 dApp browser application",
   "main": "index.js",
   "scripts": {