From 4a9d5b1c258912acedd6f1e89fb632526d9c910b Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 21 Jul 2016 10:15:34 -0700 Subject: Add data field to pass up parameters up to reducer. --- ui/app/reducers/metamask.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ui/app/reducers/metamask.js') diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index f3ef8eb11..d5d17135f 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -109,6 +109,12 @@ function reduceMetamask (state, action) { var identities = extend(metamaskState.identities, id) return extend(metamaskState, { identities }) + case actions.SET_CURRENT_FIAT: + return extend(metaMaskState, { + currentFiat: action.value.currentFiat, + conversionRate: action.value.conversionRate, + }) + default: return metamaskState -- cgit v1.2.3 From 716e65424d2ba490a384bfc1f0591685eb2867fa Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 21 Jul 2016 14:08:26 -0700 Subject: Add date access throughout the data flow. --- ui/app/reducers/metamask.js | 1 + 1 file changed, 1 insertion(+) (limited to 'ui/app/reducers/metamask.js') diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index d5d17135f..50b9e0819 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -113,6 +113,7 @@ function reduceMetamask (state, action) { return extend(metaMaskState, { currentFiat: action.value.currentFiat, conversionRate: action.value.conversionRate, + conversionDate: action.value.conversionDate, }) default: -- cgit v1.2.3 From 22528002e1edef84ade67d5bc30b2580e6542c05 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Fri, 22 Jul 2016 10:15:39 -0700 Subject: Linting! --- ui/app/reducers/metamask.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/reducers/metamask.js') diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 50b9e0819..46397edd4 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -110,7 +110,7 @@ function reduceMetamask (state, action) { return extend(metamaskState, { identities }) case actions.SET_CURRENT_FIAT: - return extend(metaMaskState, { + return extend(metamaskState, { currentFiat: action.value.currentFiat, conversionRate: action.value.conversionRate, conversionDate: action.value.conversionDate, -- cgit v1.2.3 From ccd85d19e3c95322b7bd80f46ce4e81f3b82bf0c Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 4 Aug 2016 19:09:42 -0700 Subject: Create default values for metamask state for conversion. Fix config files for ui dev. --- ui/app/reducers/metamask.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ui/app/reducers/metamask.js') diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index eba59ab45..100855ea1 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -14,6 +14,9 @@ function reduceMetamask (state, action) { rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, unconfTxs: {}, + currentFiat: 'PENDING', + conversionRate: 'N/A', + conversionDate: 'N/A', }, state.metamask) switch (action.type) { -- cgit v1.2.3 From be76b05726a5431249ed651ff1282cc584b0724b Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 4 Aug 2016 23:27:30 -0700 Subject: Holding off on select formatting for now. Renamed keys for options. --- ui/app/reducers/metamask.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/reducers/metamask.js') diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 100855ea1..a63de9005 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -14,7 +14,7 @@ function reduceMetamask (state, action) { rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, unconfTxs: {}, - currentFiat: 'PENDING', + currentFiat: 'USD', conversionRate: 'N/A', conversionDate: 'N/A', }, state.metamask) -- cgit v1.2.3 From 666f3cd66ce56013e5688d514e3c1fc3ec8a6ac4 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 16 Aug 2016 15:11:40 -0700 Subject: Added compliance for tests and properly accounts for N/A conversions. --- ui/app/reducers/metamask.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/reducers/metamask.js') diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 7af805f06..7f18480cb 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -16,7 +16,7 @@ function reduceMetamask (state, action) { identities: {}, unconfTxs: {}, currentFiat: 'USD', - conversionRate: 'N/A', + conversionRate: 0, conversionDate: 'N/A', }, state.metamask) -- cgit v1.2.3