Merge pull request #976 from lightninglabs/sat-default

Preselect SAT as default for Bitcoin values

Author: valentinewallace

src/config.js

@@ -39,5 +39,5 @@ module.exports.FIATS = {
   eur: { display: '€', displayLong: 'Euro' },
   gbp: { display: '£', displayLong: 'British Pound' },
 };
-module.exports.DEFAULT_UNIT = 'btc';
+module.exports.DEFAULT_UNIT = 'sat';
 module.exports.DEFAULT_FIAT = 'usd';

test/integration/action/action-integration.spec.js

@@ -120,6 +120,8 @@ describe('Action Integration Tests', function() {
     sandbox.stub(logger);
     store1 = new Store();
     store2 = new Store();
+    store1.settings.unit = 'btc';
+    store2.settings.unit = 'btc';
     store1.settings.displayFiat = false;
     store2.settings.displayFiat = false;
     store1.init();

test/unit/action/app-storage.spec.js

@@ -28,17 +28,17 @@ describe('Action App Storage Unit Tests', () => {
     it('should use default if nothing is saved yet', async () => {
       AsyncStorageStub.getItem.resolves(undefined);
       await db.restore(AsyncStorageStub);
-      expect(store.settings.unit, 'to equal', 'btc');
+      expect(store.settings.unit, 'to equal', 'sat');
       expect(logger.error, 'was not called');
       expect(store.loaded, 'to be', true);
     });
 
     it('should set supported setting', async () => {
       AsyncStorageStub.getItem
         .withArgs('settings')
-        .resolves(JSON.stringify({ unit: 'sat' }));
+        .resolves(JSON.stringify({ unit: 'btc' }));
       await db.restore(AsyncStorageStub);
-      expect(store.settings.unit, 'to equal', 'sat');
+      expect(store.settings.unit, 'to equal', 'btc');
       expect(store.loaded, 'to be', true);
     });
 

test/unit/action/channel.spec.js

@@ -21,6 +21,7 @@ describe('Action Channels Unit Tests', () => {
     sandbox = sinon.createSandbox({});
     sandbox.stub(logger);
     store = new Store();
+    store.settings.unit = 'btc';
     store.settings.displayFiat = false;
     require('../../../src/config').RETRY_DELAY = 1;
     grpc = sinon.createStubInstance(GrpcAction);

test/unit/action/invoice.spec.js

@@ -14,6 +14,7 @@ describe('Action Invoice Unit Tests', () => {
 
   beforeEach(() => {
     store = new Store();
+    store.settings.unit = 'btc';
     store.settings.displayFiat = false;
     require('../../../src/config').RETRY_DELAY = 1;
     nav = sinon.createStubInstance(NavAction);

test/unit/action/payment.spec.js

@@ -21,6 +21,7 @@ describe('Action Payments Unit Tests', () => {
     sandbox = sinon.createSandbox({});
     sandbox.stub(logger);
     store = new Store();
+    store.settings.unit = 'btc';
     store.settings.displayFiat = false;
     require('../../../src/config').RETRY_DELAY = 1;
     require('../../../src/config').PAYMENT_TIMEOUT = 1;

test/unit/computed/channel.spec.js

@@ -6,6 +6,7 @@ describe('Computed Channels Unit Tests', () => {
 
   beforeEach(() => {
     store = new Store();
+    store.settings.unit = 'btc';
     store.settings.displayFiat = false;
     store.channels.push({
       remotePubkey: 'some-pub-key',

test/unit/computed/invoice.spec.js

@@ -6,6 +6,7 @@ describe('Computed Invoice Unit Tests', () => {
 
   beforeEach(() => {
     store = new Store();
+    store.settings.unit = 'btc';
     store.settings.displayFiat = false;
   });
 

test/unit/computed/payment.spec.js

@@ -6,6 +6,7 @@ describe('Computed Payment Unit Tests', () => {
 
   beforeEach(() => {
     store = new Store();
+    store.settings.unit = 'btc';
     store.settings.displayFiat = false;
   });
 

test/unit/computed/setting.spec.js

@@ -11,7 +11,11 @@ describe('Computed Settings Unit Tests', () => {
   describe('ComputedSetting()', () => {
     it('should work with initial store', () => {
       ComputedSetting(store);
-      expect(store.selectedUnitLabel, 'to equal', 'Bitcoin');
+      expect(
+        store.selectedUnitLabel,
+        'to match',
+        /Satoshi {3}\(0[,.]00000001 BTC\)/
+      );
       expect(store.selectedFiatLabel, 'to equal', 'US Dollar');
       expect(store.satUnitLabel, 'to be ok');
       expect(store.bitUnitLabel, 'to be ok');
@@ -22,13 +26,9 @@ describe('Computed Settings Unit Tests', () => {
     });
 
     it('should display satoshis denominated in BTC', () => {
-      store.settings.unit = 'sat';
+      store.settings.unit = 'btc';
       ComputedSetting(store);
-      expect(
-        store.selectedUnitLabel,
-        'to match',
-        /Satoshi {3}\(0[,.]00000001 BTC\)/
-      );
+      expect(store.selectedUnitLabel, 'to equal', 'Bitcoin');
     });
   });
 });