in app provider works, no redirect on ios

Author: SteveMieskoski

example/app/src/App.vue

@@ -350,6 +350,7 @@ export default {
     };
   },
   mounted() {
+    localStorage.debug = '*'
     console.log('LOADEDED'); // todo remove dev item
     // console.log(window.web3.currentProvider.isTrust); // todo remove dev item
     // this.thing = window.web3.currentProvider.isMewConnect;
@@ -664,16 +665,16 @@ export default {
         this.web3.eth.getTransactionCount(this.userAddress).then(nonce => {
           console.log('NONCE', nonce); // todo remove dev item
           this.web3.eth
-            .sendTransaction({
+            .signTransaction({
               from: this.userAddress,
               to: this.userAddress,
               nonce,
               value: 0,
               gasPrice: gasPrice,
               data: '0x',
-              gas: 21000,
-              gasLimit: 21000
-            })
+              gas: '0x5208',
+              gasLimit: '0x5208'
+            }, this.userAddress)
             .then(txhash => {
               console.log('THEN: ', txhash);
               this.signedTxNonStandard = txhash;

src/connectClient/constants/constants.js

@@ -70,7 +70,8 @@ const lifeCycle = {
   Failed: 'failed',
   attemptedDisconnectedSend: 'attemptedDisconnectedSend',
   connected: 'connected',
-  disconnected: 'disconnected'
+  disconnected: 'disconnected',
+  ShowReload: 'ShowReload'
 };
 
 const communicationTypes = {

src/connectClient/initiator/MewConnectInitiator.js

@@ -297,6 +297,9 @@ Keys
       this.V2.on('retryingViaTurn', () => {
         this.refreshCheck();
       });
+      this.V2.on('ShowReload', () => {
+        this.uiCommunicator('ShowReload');
+      });
     } catch (e) {
       // eslint-disable-next-line
       console.error(e);

src/connectClient/initiator/MewConnectInitiatorV2.js

@@ -505,8 +505,12 @@ export default class MewConnectInitiatorV2 extends MewConnectCommon {
     debug(err.code);
     debug('error', err);
     if (!this.connected && !this.tryingTurn && !this.turnDisabled) {
+      console.log('USING FALLBACK'); // todo remove dev item
       this.useFallback();
-    } else {
+    } else if (!this.connected && this.tryingTurn && !this.turnDisabled) {
+      this.emit('ShowReload');
+    }
+    else {
       if (!this.isAlive()) {
         this.uiCommunicator(this.lifeCycle.RtcErrorEvent);
       }

src/connectProvider/index.js

@@ -42,12 +42,6 @@ export default class Integration extends EventEmitter {
         ) {
           this.runningInApp = true;
           state.web3Provider = window.web3.currentProvider;
-          // rpcCall; 1; [object Object]",
-          // "ARGS rpcCall 4 {"jsonrpc":"2.0","id":4,"method":"eth_getBalance","params":["0x192627797720b7c5ec7b9faaeafa41ff49f866e3","latest"]}"
-          // state.web3Provider.postMessage = (arg1, arg2, arg3) => {
-          //   console.log('ARGS', arg1, arg2, JSON.stringify(arg3)); // todo remove dev item
-          //   return window.web3.currentProvider.postMessage(arg1, arg2, arg3)
-          // }
         } else {
           this.runningInApp = false;
         }
@@ -136,7 +130,7 @@ export default class Integration extends EventEmitter {
             MEWconnectWallet.setConnectionState(CONNECTED);
             resolve(address);
           })
-          .catch(console.error); // todo remove dev item
+          .catch(console.error);
       });
     }
 
@@ -231,30 +225,12 @@ export default class Integration extends EventEmitter {
     let web3Provider;
     try {
       if (this.runningInApp) {
-        console.log('not here'); // todo remove dev item
-        console.log('not here'); // todo remove dev item
         if (state.web3Provider) {
           web3Provider = state.web3Provider;
         } else {
           web3Provider = window.web3.currentProvider;
         }
-        // web3Provider = new MEWProvider(
-        //   window.web3.currentProvider,
-        //   {},
-        //   {
-        //     state: state
-        //   },
-        //   eventHub
-        // );
-
-        // if (
-        //   (window.web3.currentProvider.isMewConnect ||
-        //     window.web3.currentProvider.isTrust) &&
-        //   this.runningInApp
-        // ) {
-        //
-        // }
-        // console.log('PROVIDER', web3Provider); // todo remove dev item
+
       } else {
 
         const chain = this.identifyChain(CHAIN_ID || 1);

src/connectProvider/platformDeepLinking.js

@@ -55,6 +55,9 @@ export function nativeCheck() {
           let scheme = `${SCHEMA_BASE}?url=${url}`;
           window.location.replace(scheme);
         };
+        if(iOS()){
+        return resolve(true);
+        }
         const triggerAppOpen = () => {
           openApp();
           setTimeout(fallbackToStore, 1000);

src/connectProvider/web3Provider/web3-provider/index.js

@@ -1,11 +1,9 @@
 import WSProvider from './providers/ws-provider';
-import InAppProvider from './providers/in-app-provider';
 class MEWProvider {
   constructor(host, options, store, eventHub) {
     if (host && typeof host === 'string') {
       return new WSProvider(host, options, store, eventHub);
     }
-    return new InAppProvider(host, options, store, eventHub);
   }
 }
 

src/connectProvider/web3Provider/web3-provider/providers/in-app-provider.js

@@ -13,6 +13,9 @@ class InAppProvider {
           const values = ['eth_signTransaction', 'eth_sendTransaction'];
 
           if (values.includes(argumentsList[0].method)) {
+            if(argumentsList[0].method === values[0]){
+              argumentsList[0].method = 'signTransaction'
+            }
             const checks = async payloadInner => {
               // console.log('PAYLOAD_INNER send', JSON.stringify(payloadInner)); // todo remove dev item
               // console.log('PAYLOAD_INNER send2', payloadInner.method); // todo remove dev item

src/index.js

@@ -10,7 +10,7 @@ import 'core-js/stable';
 import 'regenerator-runtime/runtime';
 import MewConnectClient from './connectClient/index';
 import MewConnectProvider from './connectProvider/index';
-import icons from './Icon'
+import icons from './Icon';
 
 export default {
   Initiator: MewConnectClient.Initiator,