diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
| commit | 13820b6cc1801a420f39cdfecd7ccb5309dc597b (patch) | |
| tree | c79832d7077ab03e0afe0c322cb32b204865d8b5 /app/scripts/controllers/network/createMetamaskMiddleware.js | |
| parent | eeecee01540fbad50c4c463a3b1a54142a63f168 (diff) | |
| parent | 07ab613d4c647e3fe554bc06eab8cfb833315a88 (diff) | |
| download | tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.gz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.zst tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.zip | |
fix conflicts
Diffstat (limited to 'app/scripts/controllers/network/createMetamaskMiddleware.js')
| -rw-r--r-- | app/scripts/controllers/network/createMetamaskMiddleware.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/network/createMetamaskMiddleware.js b/app/scripts/controllers/network/createMetamaskMiddleware.js index 8b17829b7..9e6a45888 100644 --- a/app/scripts/controllers/network/createMetamaskMiddleware.js +++ b/app/scripts/controllers/network/createMetamaskMiddleware.js @@ -38,6 +38,6 @@ function createPendingNonceMiddleware ({ getPendingNonce }) { const address = req.params[0] const blockRef = req.params[1] if (blockRef !== 'pending') return next() - req.result = await getPendingNonce(address) + res.result = await getPendingNonce(address) }) } |