diff options
author | Dan <danjm.com@gmail.com> | 2018-05-24 02:33:15 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-05-24 02:33:15 +0800 |
commit | 440905125d77d1d5d72d1aceac2940925a8ac38f (patch) | |
tree | d5418384983f9de8092d2dfdd1ddddec2ffd555e /ui/app/reducers/metamask.js | |
parent | 3dec7cb52443b24d6a24f75434ee41a54f4cfd0b (diff) | |
parent | ed01c6c8264a860cdc4248991839954bdf22e2ef (diff) | |
download | tangerine-wallet-browser-440905125d77d1d5d72d1aceac2940925a8ac38f.tar.gz tangerine-wallet-browser-440905125d77d1d5d72d1aceac2940925a8ac38f.tar.zst tangerine-wallet-browser-440905125d77d1d5d72d1aceac2940925a8ac38f.zip |
Merge branch 'develop' into i3725-refactor-send-component-
Diffstat (limited to 'ui/app/reducers/metamask.js')
-rw-r--r-- | ui/app/reducers/metamask.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 5564c8080..a4d1aece5 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -28,6 +28,7 @@ function reduceMetamask (state, action) { contractExchangeRates: {}, tokenExchangeRates: {}, tokens: [], + pendingTokens: {}, send: { gasLimit: null, gasPrice: null, @@ -163,7 +164,7 @@ function reduceMetamask (state, action) { selectedTokenAddress: action.value, }) - case actions.SAVE_ACCOUNT_LABEL: + case actions.SET_ACCOUNT_LABEL: const account = action.value.account const name = action.value.label const id = {} @@ -345,6 +346,17 @@ function reduceMetamask (state, action) { currentLocale: action.value, }) + case actions.SET_PENDING_TOKENS: + return extend(metamaskState, { + pendingTokens: { ...action.payload }, + }) + + case actions.CLEAR_PENDING_TOKENS: { + return extend(metamaskState, { + pendingTokens: {}, + }) + } + default: return metamaskState |