From 5238e2374474d5fbb4bc4ebb65f3a6d05d08cffb Mon Sep 17 00:00:00 2001 From: pbca26 Date: Tue, 5 Sep 2017 22:26:21 +0300 Subject: [PATCH] suppress login success message in native only --- react/src/actions/actions/walletAuth.js | 18 ++++++++++-------- react/src/components/main/main.js | 13 ++++++++++++- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/react/src/actions/actions/walletAuth.js b/react/src/actions/actions/walletAuth.js index 95ca1d8..ece1be1 100644 --- a/react/src/actions/actions/walletAuth.js +++ b/react/src/actions/actions/walletAuth.js @@ -158,15 +158,17 @@ export function iguanaActiveHandle(getMainAddress) { } } -export function iguanaWalletPassphraseState(json, dispatch) { +export function iguanaWalletPassphraseState(json, dispatch, skipToastr) { sessionStorage.setItem('IguanaActiveAccount', JSON.stringify(json)); - dispatch( - triggerToaster( - translate('TOASTR.LOGIN_SUCCESSFULL'), - translate('TOASTR.ACCOUNT_NOTIFICATION'), - 'success' - ) - ); + if (!skipToastr) { + dispatch( + triggerToaster( + translate('TOASTR.LOGIN_SUCCESSFULL'), + translate('TOASTR.ACCOUNT_NOTIFICATION'), + 'success' + ) + ); + } dispatch(getMainAddressState(json)); dispatch(iguanaActiveHandleState(json)); diff --git a/react/src/components/main/main.js b/react/src/components/main/main.js index d2fd8bd..6443289 100644 --- a/react/src/components/main/main.js +++ b/react/src/components/main/main.js @@ -7,7 +7,8 @@ import { Config, getDexCoins, iguanaActiveHandle, - triggerToaster + triggerToaster, + iguanaActiveHandleBypass } from '../../actions/actionCreators'; const IGUANA_ACTIVE_HANDLE_TIMEOUT = 30000; @@ -80,9 +81,19 @@ class Main extends React.Component { } componentWillMount() { + let appConfig; // set userpass param Store.dispatch(getDexCoins()); iguanaSetRPCAuth(); + + try { + appConfig = window.require('electron').remote.getCurrentWindow().appConfig; + } catch (e) {} + + + if (appConfig.iguanaLessMode) { + Store.dispatch(iguanaActiveHandleBypass()); + } } isWalletUnlocked() {