diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js index 3e7e29ca66..75490bad0b 100644 --- a/app/scripts/controllers/decryptWalletCtrl.js +++ b/app/scripts/controllers/decryptWalletCtrl.js @@ -617,22 +617,22 @@ var decryptWalletCtrl = function($scope, $sce, walletService) { globalFuncs.MEWconnectStatus.update(0); var app = new MewConnectEth(); - globalFuncs.MEWconnectStatus.mewConnect = MewConnect.init(); + globalFuncs.MEWconnectStatus.MEWconnect = MewConnect.init(); $scope.$on("$destroy", function() { globalFuncs.MEWconnectStatus.newTabOpenedTrigger(false); globalFuncs.MEWconnectStatus.update(0); - globalFuncs.MEWconnectStatus.mewConnect.disconnectRTC(); - globalFuncs.MEWconnectStatus.mewConnect = null; + globalFuncs.MEWconnectStatus.MEWconnect.disconnectRTC(); + globalFuncs.MEWconnectStatus.MEWconnect = null; }); - globalFuncs.MEWconnectStatus.mewConnect.on("codeDisplay", codeDisplay); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcConnectedEvent", rtcConnected); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcClosedEvent", rtcClosed); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcDisconnectEvent", rtcDisconnected); - globalFuncs.MEWconnectStatus.mewConnect.on("address", makeWallet); + globalFuncs.MEWconnectStatus.MEWconnect.on("codeDisplay", codeDisplay); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcConnectedEvent", rtcConnected); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcClosedEvent", rtcClosed); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcDisconnectEvent", rtcDisconnected); + globalFuncs.MEWconnectStatus.MEWconnect.on("address", makeWallet); - app.setMewConnect(globalFuncs.MEWconnectStatus.mewConnect); + app.setMewConnect(globalFuncs.MEWconnectStatus.MEWconnect); app.signalerConnect(); $scope.connectionCodeTimeout = null; @@ -645,7 +645,7 @@ var decryptWalletCtrl = function($scope, $sce, walletService) { if ($scope.mewConnectionStatus !== 2) { $scope.connectionCodeTimeout = null; uiFuncs.notifier.info("Connected Via MEWconnect"); - globalFuncs.MEWconnectStatus.mewConnect.sendRtcMessage("address", ""); + globalFuncs.MEWconnectStatus.MEWconnect.sendRtcMessage("address", ""); $scope.mewConnectionStatus = 2; } } @@ -693,7 +693,7 @@ var decryptWalletCtrl = function($scope, $sce, walletService) { }; $scope.mewConnectDisconnect = function() { - globalFuncs.MEWconnectStatus.mewConnect.disconnectRTC(); + globalFuncs.MEWconnectStatus.MEWconnect.disconnectRTC(); }; //= ================ Mew Connect (end)============================== $scope.getLedgerPath = function() { diff --git a/app/scripts/controllers/signMsgCtrl.js b/app/scripts/controllers/signMsgCtrl.js index e801b5c68f..5d5da42099 100644 --- a/app/scripts/controllers/signMsgCtrl.js +++ b/app/scripts/controllers/signMsgCtrl.js @@ -202,7 +202,7 @@ var signMsgCtrl = function($scope, $sce, walletService) { //TODO reset ui when rtc disconnects // var msg = Buffer.from(thisMessage).toString("hex"); var connectApp = new MewConnectEth(); - var mewConnect =globalFuncs.MEWconnectStatus.mewConnect; + var mewConnect =globalFuncs.MEWconnectStatus.MEWconnect; connectApp.setMewConnect(mewConnect); mewConnect.on("signMessage", function(data) { $scope.signMsg.signedMsg = JSON.stringify( diff --git a/app/scripts/uiFuncs.js b/app/scripts/uiFuncs.js index 45e68fd45a..87cbd974ad 100644 --- a/app/scripts/uiFuncs.js +++ b/app/scripts/uiFuncs.js @@ -144,7 +144,7 @@ uiFuncs.signTxMewConnect = function (eTx, rawTx, txData, callback) { var app = new MewConnectEth() // var mewConnect = MewConnect.instance - var mewConnect = globalFuncs.MEWconnectStatus.mewConnect; + var mewConnect = globalFuncs.MEWconnectStatus.MEWconnect; app.setMewConnect(mewConnect) mewConnect.once('signTx', function(data) { uiFuncs.notifier.info("The transaction was signed but not sent. Click the blue 'Send Transaction' button to continue.") diff --git a/chrome-extension/js/etherwallet-master.js b/chrome-extension/js/etherwallet-master.js index 65bd462c6e..848de07e63 100644 --- a/chrome-extension/js/etherwallet-master.js +++ b/chrome-extension/js/etherwallet-master.js @@ -5268,22 +5268,22 @@ var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService) globalFuncs.MEWconnectStatus.update(0); var app = new MewConnectEth(); - globalFuncs.MEWconnectStatus.mewConnect = MewConnect.init(); + globalFuncs.MEWconnectStatus.MEWconnect = MewConnect.init(); $scope.$on("$destroy", function () { globalFuncs.MEWconnectStatus.newTabOpenedTrigger(false); globalFuncs.MEWconnectStatus.update(0); - globalFuncs.MEWconnectStatus.mewConnect.disconnectRTC(); - globalFuncs.MEWconnectStatus.mewConnect = null; + globalFuncs.MEWconnectStatus.MEWconnect.disconnectRTC(); + globalFuncs.MEWconnectStatus.MEWconnect = null; }); - globalFuncs.MEWconnectStatus.mewConnect.on("codeDisplay", codeDisplay); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcConnectedEvent", rtcConnected); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcClosedEvent", rtcClosed); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcDisconnectEvent", rtcDisconnected); - globalFuncs.MEWconnectStatus.mewConnect.on("address", makeWallet); + globalFuncs.MEWconnectStatus.MEWconnect.on("codeDisplay", codeDisplay); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcConnectedEvent", rtcConnected); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcClosedEvent", rtcClosed); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcDisconnectEvent", rtcDisconnected); + globalFuncs.MEWconnectStatus.MEWconnect.on("address", makeWallet); - app.setMewConnect(globalFuncs.MEWconnectStatus.mewConnect); + app.setMewConnect(globalFuncs.MEWconnectStatus.MEWconnect); app.signalerConnect(); $scope.connectionCodeTimeout = null; @@ -5296,7 +5296,7 @@ var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService) if ($scope.mewConnectionStatus !== 2) { $scope.connectionCodeTimeout = null; uiFuncs.notifier.info("Connected Via MEWconnect"); - globalFuncs.MEWconnectStatus.mewConnect.sendRtcMessage("address", ""); + globalFuncs.MEWconnectStatus.MEWconnect.sendRtcMessage("address", ""); $scope.mewConnectionStatus = 2; } } @@ -5344,7 +5344,7 @@ var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService) }; $scope.mewConnectDisconnect = function () { - globalFuncs.MEWconnectStatus.mewConnect.disconnectRTC(); + globalFuncs.MEWconnectStatus.MEWconnect.disconnectRTC(); }; //= ================ Mew Connect (end)============================== $scope.getLedgerPath = function () { @@ -7104,7 +7104,7 @@ var signMsgCtrl = function signMsgCtrl($scope, $sce, walletService) { //TODO reset ui when rtc disconnects // var msg = Buffer.from(thisMessage).toString("hex"); var connectApp = new MewConnectEth(); - var mewConnect = globalFuncs.MEWconnectStatus.mewConnect; + var mewConnect = globalFuncs.MEWconnectStatus.MEWconnect; connectApp.setMewConnect(mewConnect); mewConnect.on("signMessage", function (data) { $scope.signMsg.signedMsg = JSON.stringify({ @@ -20015,7 +20015,6 @@ var MewConnectEth = function () { key: 'checkBrowser', value: function checkBrowser() { var browser = window.browser; - console.log(browser.version); // todo remove dev item var version = browser.version.split('.')[0]; /* * Chrome > 23 @@ -20054,7 +20053,7 @@ var MewConnectEth = function () { } else { return MewConnectEth.buildBrowserResult(false, '', ''); } - console.log(minVersion, +version); // todo remove dev item + try { if (minVersion >= +version) { return MewConnectEth.buildBrowserResult(true, name, 'version: ' + version); @@ -31395,7 +31394,7 @@ uiFuncs.signTxMewConnect = function (eTx, rawTx, txData, callback) { var app = new MewConnectEth(); // var mewConnect = MewConnect.instance - var mewConnect = globalFuncs.MEWconnectStatus.mewConnect; + var mewConnect = globalFuncs.MEWconnectStatus.MEWconnect; app.setMewConnect(mewConnect); mewConnect.once('signTx', function (data) { uiFuncs.notifier.info("The transaction was signed but not sent. Click the blue 'Send Transaction' button to continue."); diff --git a/dist/js/etherwallet-master.js b/dist/js/etherwallet-master.js index 65bd462c6e..848de07e63 100644 --- a/dist/js/etherwallet-master.js +++ b/dist/js/etherwallet-master.js @@ -5268,22 +5268,22 @@ var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService) globalFuncs.MEWconnectStatus.update(0); var app = new MewConnectEth(); - globalFuncs.MEWconnectStatus.mewConnect = MewConnect.init(); + globalFuncs.MEWconnectStatus.MEWconnect = MewConnect.init(); $scope.$on("$destroy", function () { globalFuncs.MEWconnectStatus.newTabOpenedTrigger(false); globalFuncs.MEWconnectStatus.update(0); - globalFuncs.MEWconnectStatus.mewConnect.disconnectRTC(); - globalFuncs.MEWconnectStatus.mewConnect = null; + globalFuncs.MEWconnectStatus.MEWconnect.disconnectRTC(); + globalFuncs.MEWconnectStatus.MEWconnect = null; }); - globalFuncs.MEWconnectStatus.mewConnect.on("codeDisplay", codeDisplay); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcConnectedEvent", rtcConnected); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcClosedEvent", rtcClosed); - globalFuncs.MEWconnectStatus.mewConnect.on("RtcDisconnectEvent", rtcDisconnected); - globalFuncs.MEWconnectStatus.mewConnect.on("address", makeWallet); + globalFuncs.MEWconnectStatus.MEWconnect.on("codeDisplay", codeDisplay); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcConnectedEvent", rtcConnected); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcClosedEvent", rtcClosed); + globalFuncs.MEWconnectStatus.MEWconnect.on("RtcDisconnectEvent", rtcDisconnected); + globalFuncs.MEWconnectStatus.MEWconnect.on("address", makeWallet); - app.setMewConnect(globalFuncs.MEWconnectStatus.mewConnect); + app.setMewConnect(globalFuncs.MEWconnectStatus.MEWconnect); app.signalerConnect(); $scope.connectionCodeTimeout = null; @@ -5296,7 +5296,7 @@ var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService) if ($scope.mewConnectionStatus !== 2) { $scope.connectionCodeTimeout = null; uiFuncs.notifier.info("Connected Via MEWconnect"); - globalFuncs.MEWconnectStatus.mewConnect.sendRtcMessage("address", ""); + globalFuncs.MEWconnectStatus.MEWconnect.sendRtcMessage("address", ""); $scope.mewConnectionStatus = 2; } } @@ -5344,7 +5344,7 @@ var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService) }; $scope.mewConnectDisconnect = function () { - globalFuncs.MEWconnectStatus.mewConnect.disconnectRTC(); + globalFuncs.MEWconnectStatus.MEWconnect.disconnectRTC(); }; //= ================ Mew Connect (end)============================== $scope.getLedgerPath = function () { @@ -7104,7 +7104,7 @@ var signMsgCtrl = function signMsgCtrl($scope, $sce, walletService) { //TODO reset ui when rtc disconnects // var msg = Buffer.from(thisMessage).toString("hex"); var connectApp = new MewConnectEth(); - var mewConnect = globalFuncs.MEWconnectStatus.mewConnect; + var mewConnect = globalFuncs.MEWconnectStatus.MEWconnect; connectApp.setMewConnect(mewConnect); mewConnect.on("signMessage", function (data) { $scope.signMsg.signedMsg = JSON.stringify({ @@ -20015,7 +20015,6 @@ var MewConnectEth = function () { key: 'checkBrowser', value: function checkBrowser() { var browser = window.browser; - console.log(browser.version); // todo remove dev item var version = browser.version.split('.')[0]; /* * Chrome > 23 @@ -20054,7 +20053,7 @@ var MewConnectEth = function () { } else { return MewConnectEth.buildBrowserResult(false, '', ''); } - console.log(minVersion, +version); // todo remove dev item + try { if (minVersion >= +version) { return MewConnectEth.buildBrowserResult(true, name, 'version: ' + version); @@ -31395,7 +31394,7 @@ uiFuncs.signTxMewConnect = function (eTx, rawTx, txData, callback) { var app = new MewConnectEth(); // var mewConnect = MewConnect.instance - var mewConnect = globalFuncs.MEWconnectStatus.mewConnect; + var mewConnect = globalFuncs.MEWconnectStatus.MEWconnect; app.setMewConnect(mewConnect); mewConnect.once('signTx', function (data) { uiFuncs.notifier.info("The transaction was signed but not sent. Click the blue 'Send Transaction' button to continue.");