mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Remove SET_CURRENT_FIAT
action (#11003)
The `SET_CURRENT_FIAT` action has been removed. It has been replaced by a call to `forceUpdateMetamaskState`. The only purpose of this action was to eagerly update the current fiat currency settings before the next state update. Forcing a state update instead is simpler and safer. The `setCurrentCurrency` function in the background has been updated to no longer return the state, now that it's no longer needed.
This commit is contained in:
parent
e906bd8d0e
commit
9d002cbff0
@ -2522,7 +2522,7 @@ export default class MetamaskController extends EventEmitter {
|
|||||||
};
|
};
|
||||||
this.currencyRateController.update(currencyState);
|
this.currencyRateController.update(currencyState);
|
||||||
this.currencyRateController.configure(currencyState);
|
this.currencyRateController.configure(currencyState);
|
||||||
cb(null, this.currencyRateController.state);
|
cb(null);
|
||||||
return;
|
return;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
cb(err);
|
cb(err);
|
||||||
|
@ -93,13 +93,6 @@ export default function reduceMetamask(state = {}, action) {
|
|||||||
return Object.assign(metamaskState, { identities });
|
return Object.assign(metamaskState, { identities });
|
||||||
}
|
}
|
||||||
|
|
||||||
case actionConstants.SET_CURRENT_FIAT:
|
|
||||||
return Object.assign(metamaskState, {
|
|
||||||
currentCurrency: action.value.currentCurrency,
|
|
||||||
conversionRate: action.value.conversionRate,
|
|
||||||
conversionDate: action.value.conversionDate,
|
|
||||||
});
|
|
||||||
|
|
||||||
case actionConstants.UPDATE_TOKENS:
|
case actionConstants.UPDATE_TOKENS:
|
||||||
return {
|
return {
|
||||||
...metamaskState,
|
...metamaskState,
|
||||||
|
@ -74,26 +74,6 @@ describe('MetaMask Reducers', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('sets current fiat', () => {
|
|
||||||
const value = {
|
|
||||||
currentCurrency: 'yen',
|
|
||||||
conversionRate: 3.14,
|
|
||||||
conversionDate: new Date(2018, 9),
|
|
||||||
};
|
|
||||||
|
|
||||||
const state = reduceMetamask(
|
|
||||||
{},
|
|
||||||
{
|
|
||||||
type: actionConstants.SET_CURRENT_FIAT,
|
|
||||||
value,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(state.currentCurrency).toStrictEqual(value.currentCurrency);
|
|
||||||
expect(state.conversionRate).toStrictEqual(value.conversionRate);
|
|
||||||
expect(state.conversionDate).toStrictEqual(value.conversionDate);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('updates tokens', () => {
|
it('updates tokens', () => {
|
||||||
const newTokens = {
|
const newTokens = {
|
||||||
address: '0x617b3f8050a0bd94b6b1da02b4384ee5b4df13f4',
|
address: '0x617b3f8050a0bd94b6b1da02b4384ee5b4df13f4',
|
||||||
|
@ -29,7 +29,6 @@ export const HIDE_WARNING = 'HIDE_WARNING';
|
|||||||
export const SHOW_ACCOUNT_DETAIL = 'SHOW_ACCOUNT_DETAIL';
|
export const SHOW_ACCOUNT_DETAIL = 'SHOW_ACCOUNT_DETAIL';
|
||||||
export const SHOW_ACCOUNTS_PAGE = 'SHOW_ACCOUNTS_PAGE';
|
export const SHOW_ACCOUNTS_PAGE = 'SHOW_ACCOUNTS_PAGE';
|
||||||
export const SHOW_CONF_TX_PAGE = 'SHOW_CONF_TX_PAGE';
|
export const SHOW_CONF_TX_PAGE = 'SHOW_CONF_TX_PAGE';
|
||||||
export const SET_CURRENT_FIAT = 'SET_CURRENT_FIAT';
|
|
||||||
// account detail screen
|
// account detail screen
|
||||||
export const SHOW_SEND_TOKEN_PAGE = 'SHOW_SEND_TOKEN_PAGE';
|
export const SHOW_SEND_TOKEN_PAGE = 'SHOW_SEND_TOKEN_PAGE';
|
||||||
export const SHOW_PRIVATE_KEY = 'SHOW_PRIVATE_KEY';
|
export const SHOW_PRIVATE_KEY = 'SHOW_PRIVATE_KEY';
|
||||||
|
@ -470,25 +470,16 @@ export function setCurrentCurrency(currencyCode) {
|
|||||||
return async (dispatch) => {
|
return async (dispatch) => {
|
||||||
dispatch(showLoadingIndication());
|
dispatch(showLoadingIndication());
|
||||||
log.debug(`background.setCurrentCurrency`);
|
log.debug(`background.setCurrentCurrency`);
|
||||||
let data;
|
|
||||||
try {
|
try {
|
||||||
data = await promisifiedBackground.setCurrentCurrency(currencyCode);
|
await promisifiedBackground.setCurrentCurrency(currencyCode);
|
||||||
|
await forceUpdateMetamaskState(dispatch);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
log.error(error.stack);
|
log.error(error);
|
||||||
dispatch(displayWarning(error.message));
|
dispatch(displayWarning(error.message));
|
||||||
return;
|
return;
|
||||||
} finally {
|
} finally {
|
||||||
dispatch(hideLoadingIndication());
|
dispatch(hideLoadingIndication());
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatch({
|
|
||||||
type: actionConstants.SET_CURRENT_FIAT,
|
|
||||||
value: {
|
|
||||||
currentCurrency: data.currentCurrency,
|
|
||||||
conversionRate: data.conversionRate,
|
|
||||||
conversionDate: data.conversionDate,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -618,28 +618,18 @@ describe('Actions', () => {
|
|||||||
|
|
||||||
it('calls setCurrentCurrency', async () => {
|
it('calls setCurrentCurrency', async () => {
|
||||||
const store = mockStore();
|
const store = mockStore();
|
||||||
const setCurrentCurrency = background.setCurrentCurrency.callsFake(
|
background.setCurrentCurrency.callsFake((_, cb) => cb());
|
||||||
(_, cb) =>
|
|
||||||
cb(null, {
|
|
||||||
currentCurrency: 'currency',
|
|
||||||
conversionRate: 100,
|
|
||||||
conversionDate: 1611839083653,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
actions._setBackgroundConnection(background);
|
actions._setBackgroundConnection(background);
|
||||||
|
|
||||||
await store.dispatch(actions.setCurrentCurrency('jpy'));
|
await store.dispatch(actions.setCurrentCurrency('jpy'));
|
||||||
expect(setCurrentCurrency.callCount).toStrictEqual(1);
|
expect(background.setCurrentCurrency.callCount).toStrictEqual(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('throws if setCurrentCurrency throws', async () => {
|
it('throws if setCurrentCurrency throws', async () => {
|
||||||
const store = mockStore();
|
const store = mockStore();
|
||||||
|
|
||||||
background.setCurrentCurrency.callsFake((_, cb) =>
|
background.setCurrentCurrency.callsFake((_, cb) =>
|
||||||
cb(new Error('error')),
|
cb(new Error('error')),
|
||||||
);
|
);
|
||||||
|
|
||||||
actions._setBackgroundConnection(background);
|
actions._setBackgroundConnection(background);
|
||||||
|
|
||||||
const expectedActions = [
|
const expectedActions = [
|
||||||
|
Loading…
Reference in New Issue
Block a user