diff options
| author | Esteban MIno <efmino@uc.cl> | 2018-08-29 02:20:30 +0800 |
|---|---|---|
| committer | Esteban MIno <efmino@uc.cl> | 2018-08-29 02:20:30 +0800 |
| commit | e743f44150d4c09908d24945de5a281e15e8469d (patch) | |
| tree | 76984504e65b06ae15633d721fedc7ddd5b0cca7 /ui/app/components/pages/confirm-transaction-switch/confirm-transaction-switch.container.js | |
| parent | 3106374cc31b66e5a0faadd657b4430e21aa48b2 (diff) | |
| parent | 0259eb02140fec1db9861506a6ff7890911af652 (diff) | |
| download | tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.tar.gz tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.tar.zst tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.zip | |
fix conflicts
Diffstat (limited to 'ui/app/components/pages/confirm-transaction-switch/confirm-transaction-switch.container.js')
| -rw-r--r-- | ui/app/components/pages/confirm-transaction-switch/confirm-transaction-switch.container.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/app/components/pages/confirm-transaction-switch/confirm-transaction-switch.container.js b/ui/app/components/pages/confirm-transaction-switch/confirm-transaction-switch.container.js index 3d7fc78cc..7f2c36af2 100644 --- a/ui/app/components/pages/confirm-transaction-switch/confirm-transaction-switch.container.js +++ b/ui/app/components/pages/confirm-transaction-switch/confirm-transaction-switch.container.js @@ -6,14 +6,16 @@ const mapStateToProps = state => { confirmTransaction: { txData, methodData, - fetchingMethodData, + fetchingData, + toSmartContract, }, } = state return { txData, methodData, - fetchingMethodData, + fetchingData, + isEtherTransaction: !toSmartContract, } } |