diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2019-07-13 01:58:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-13 01:58:19 +0800 |
| commit | 96a12a627ec14850155420e041f3bd55e3dce71a (patch) | |
| tree | 07909b87d2eed412d63e90afb51d4e54a27c8c53 /development | |
| parent | 9be7fd39ba8aa368902a738898b191fba00b01af (diff) | |
| parent | 1c19ce91a421134a41f1e14a60196d8da0e778f0 (diff) | |
| download | tangerine-wallet-browser-96a12a627ec14850155420e041f3bd55e3dce71a.tar tangerine-wallet-browser-96a12a627ec14850155420e041f3bd55e3dce71a.tar.gz tangerine-wallet-browser-96a12a627ec14850155420e041f3bd55e3dce71a.tar.bz2 tangerine-wallet-browser-96a12a627ec14850155420e041f3bd55e3dce71a.tar.lz tangerine-wallet-browser-96a12a627ec14850155420e041f3bd55e3dce71a.tar.xz tangerine-wallet-browser-96a12a627ec14850155420e041f3bd55e3dce71a.tar.zst tangerine-wallet-browser-96a12a627ec14850155420e041f3bd55e3dce71a.zip | |
Merge pull request #6832 from MetaMask/master-rebased
Master rebased
Diffstat (limited to 'development')
| -rw-r--r-- | development/states/send-edit.json | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/development/states/send-edit.json b/development/states/send-edit.json index b500d14bd..d20277200 100644 --- a/development/states/send-edit.json +++ b/development/states/send-edit.json @@ -1,4 +1,9 @@ { + "confirmTransaction": { + "txData": { + "id": 4768706228115573 + } + }, "metamask": { "completedOnboarding": true, "isInitialized": true, @@ -66,7 +71,22 @@ ], "tokens": [], "transactions": {}, - "selectedAddressTxList": [], + "selectedAddressTxList": [{ + "id": 4768706228115573, + "time": 1487363153561, + "status": "unapproved", + "gasMultiplier": 1, + "metamaskNetworkId": "3", + "txParams": { + "from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb", + "to": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d", + "value": "0x1bc16d674ec80000", + "metamaskId": 4768706228115573, + "metamaskNetworkId": "3", + "gas": "0xea60", + "gasPrice": "0xba43b7400" + } + }], "unapprovedTxs": { "4768706228115573": { "id": 4768706228115573, |