Closes #1262

Author: tanx

src/action/setting.js

@@ -33,12 +33,12 @@ class SettingAction {
    * perist the updated settings to disk.
    * @param {string} options.fiat The fiat currency e.g. `usd`
    */
-  setFiatCurrency({ fiat }) {
+  async setFiatCurrency({ fiat }) {
     if (!FIATS[fiat]) {
       throw new Error(`Invalid fiat currency: ${fiat}`);
     }
     this._store.settings.fiat = fiat;
-    this._wallet.getExchangeRate();
+    await this._wallet.getExchangeRate();
     this._db.save();
   }
 
@@ -59,7 +59,7 @@ class SettingAction {
     try {
       let locale = await this._ipc.send('locale-get', 'locale');
       const fiat = localeCurrency.getCurrency(locale).toLowerCase();
-      this.setFiatCurrency({ fiat });
+      await this.setFiatCurrency({ fiat });
     } catch (err) {
       log.error('Detecting local currency failed', err);
     }

test/unit/action/setting.spec.js

@@ -44,17 +44,17 @@ describe('Action Setting Unit Test', () => {
   });
 
   describe('setFiatCurrency()', () => {
-    it('should set a valid fiat currency and save settings', () => {
-      setting.setFiatCurrency({ fiat: 'eur' });
+    it('should set a valid fiat currency and save settings', async () => {
+      await setting.setFiatCurrency({ fiat: 'eur' });
       expect(store.settings.fiat, 'to equal', 'eur');
       expect(wallet.getExchangeRate, 'was called once');
       expect(db.save, 'was called once');
     });
 
-    it('should throw error on invalid fiat type', () => {
-      expect(
-        setting.setFiatCurrency.bind(null, { fiat: 'invalid' }),
-        'to throw',
+    it('should throw error on invalid fiat type', async () => {
+      await expect(
+        setting.setFiatCurrency({ fiat: 'invalid' }),
+        'to be rejected with error satisfying',
         /Invalid/
       );
     });