diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 01:23:20 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 01:23:20 +0800 |
| commit | bef023fb4a699c16fe0fff30ce18840678ed7ad0 (patch) | |
| tree | d11be9af938712aeb554f070822be01b2d7fbceb /development/states/send.json | |
| parent | 37d836fa72c75945d436bd94feadb65aa95d7e5f (diff) | |
| parent | 39e0a33bba2709971edec0304027f646cb2db3cc (diff) | |
| download | tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.gz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.bz2 tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.lz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.xz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.zst tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.zip | |
Resolve merge conflict.
Diffstat (limited to 'development/states/send.json')
| -rw-r--r-- | development/states/send.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/development/states/send.json b/development/states/send.json index afc1e6397..3e1aa88ba 100644 --- a/development/states/send.json +++ b/development/states/send.json @@ -2,7 +2,6 @@ "metamask": { "isInitialized": true, "isUnlocked": true, - "isEthConfirmed": false, "currentDomain": "example.com", "rpcTarget": "https://rawtestrpc.metamask.io/", "identities": { @@ -49,7 +48,7 @@ "transactions": [], "network": "2", "seedWords": null, - "isConfirmed": true, + "isDisclaimerConfirmed": true, "unconfMsgs": {}, "messages": [], "shapeShiftTxList": [], @@ -73,4 +72,4 @@ "detailView": {} }, "identities": {} -}
\ No newline at end of file +} |