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/accounts.json | |
| parent | 37d836fa72c75945d436bd94feadb65aa95d7e5f (diff) | |
| parent | 39e0a33bba2709971edec0304027f646cb2db3cc (diff) | |
| download | tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.gz tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.tar.zst tangerine-wallet-browser-bef023fb4a699c16fe0fff30ce18840678ed7ad0.zip | |
Resolve merge conflict.
Diffstat (limited to 'development/states/accounts.json')
| -rw-r--r-- | development/states/accounts.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/development/states/accounts.json b/development/states/accounts.json index 9068be0bd..1b8f0f10b 100644 --- a/development/states/accounts.json +++ b/development/states/accounts.json @@ -2,7 +2,6 @@ "metamask": { "isInitialized": true, "isUnlocked": true, - "isEthConfirmed": true, "rpcTarget": "https://rawtestrpc.metamask.io/", "identities": { "0x0abdd95cafcabec9b3e99dcd09fc4b441037cb80": { @@ -92,7 +91,7 @@ "transactions": [], "selectedAddress": "0x0abdd95cafcabec9b3e99dcd09fc4b441037cb80", "network": "2", - "isConfirmed": true, + "isDisclaimerConfirmed": true, "unconfMsgs": {}, "messages": [], "shapeShiftTxList": [], @@ -116,4 +115,4 @@ "scrollToBottom": true }, "identities": {} -}
\ No newline at end of file +} |