Skip to content

Persist currentCurrency from state when re-initialising controller #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whymarrh merged 4 commits into from
Nov 3, 2019
Merged

Persist currentCurrency from state when re-initialising controller #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57a16d2
Use state to persist currentCurrency
rickycodes Nov 1, 2019
7d39a18
Add test
rickycodes Nov 1, 2019
c63d468
Group this
rickycodes Nov 3, 2019
ca75312
Merge branch 'develop' into develop
whymarrh Nov 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/assets/CurrencyRateController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ export class CurrencyRateController extends BaseController<CurrencyRateConfig, C
private mutex = new Mutex();
private handle?: NodeJS.Timer;

private getCurrentCurrencyFromState(state?: Partial<CurrencyRateState>) {
return (state && state.currentCurrency) ? state.currentCurrency : 'usd';
}

private getPricingURL(currentCurrency: string, nativeCurrency: string) {
return (
`https://min-api.cryptocompare.com/data/price?fsym=` +
Expand All @@ -65,7 +69,7 @@ export class CurrencyRateController extends BaseController<CurrencyRateConfig, C
constructor(config?: Partial<CurrencyRateConfig>, state?: Partial<CurrencyRateState>) {
super(config, state);
this.defaultConfig = {
currentCurrency: 'usd',
currentCurrency: this.getCurrentCurrencyFromState(state),
disabled: true,
interval: 180000,
nativeCurrency: 'ETH'
Expand Down
11 changes: 11 additions & 0 deletions tests/CurrencyRateController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ describe('CurrencyRateController', () => {
});
});

it('should initialize with the currency in state', () => {
const existingState = { currentCurrency: 'rep' };
const controller = new CurrencyRateController({}, existingState);
expect(controller.config).toEqual({
currentCurrency: 'rep',
disabled: false,
interval: 180000,
nativeCurrency: 'ETH'
});
});

it('should poll and update rate in the right interval', () => {
return new Promise((resolve) => {
const controller = new CurrencyRateController({ interval: 100 });
Expand Down