refactor(getcurrencyrate): switch btc-rate directly to sats-rate #1381

src/app/components/AllowanceMenu/index.test.tsx

@@ -22,7 +22,6 @@ jest.mock("~/common/lib/api", () => {
       currency: "USD",
       exchange: "coindesk",
     })),
-    getCurrencyRate: jest.fn(() => ({ rate: 29991.836 })),
   };
 });
 

src/app/screens/LNURLWithdraw/index.test.tsx

@@ -78,7 +78,6 @@ jest.mock("~/common/lib/api", () => ({
     exchange: "coindesk",
   })),
   makeInvoice: jest.fn(() => ({})),
-  getCurrencyRate: jest.fn(() => ({ rate: 29991.836 })),
 }));
 
 describe("LNURLWithdraw", () => {

src/app/screens/Receive/index.test.tsx

@@ -21,7 +21,6 @@ jest.mock("~/common/lib/api", () => {
       exchange: "coindesk",
     })),
     makeInvoice: jest.fn(),
-    getCurrencyRate: jest.fn(() => ({ rate: 29991.836 })),
   };
 });
 

src/common/utils/__tests__/currencyConvert.test.ts

@@ -6,7 +6,7 @@ describe("Currency coversion utils", () => {
   test("getFiatValue", async () => {
     const result = await getFiatValue({
       amount: 123456789,
-      rate: 29991.836,
+      rate: 0.00029991836,
       currency: CURRENCIES["USD"],
     });
 

src/common/utils/currencyConvert.ts

@@ -3,25 +3,18 @@
  */
 import type { CURRENCIES } from "../constants";
 
-const numSatsInBtc = 100_000_000;
-
-const bitcoinToFiat = async (amountInBtc: number | string, rate: number) => {
-  return Number(amountInBtc) * Number(rate);
-};
-
-const satoshisToBitcoin = (amountInSatoshis: number | string) => {
-  return Number(amountInSatoshis) / numSatsInBtc;
+const satsToFiat = async (amount: number | string, rate: number) => {
+  return Number(amount) * rate;
 };
 
 const satoshisToFiat = async ({
-  amountInSats,
+  amount,
   rate,
 }: {
-  amountInSats: number | string;
+  amount: number | string;
   rate: number;
 }) => {
-  const btc = satoshisToBitcoin(amountInSats);
-  const fiat = await bitcoinToFiat(btc, rate);
+  const fiat = await satsToFiat(amount, rate);
   return fiat;
 };
 
@@ -35,7 +28,7 @@ export const getFiatValue = async ({
   currency: CURRENCIES;
 }) => {
   const fiatValue = await satoshisToFiat({
-    amountInSats: amount,
+    amount,
     rate,
   });
 

src/extension/background-script/actions/cache/__tests__/getCurrencyRate.test.ts

@@ -32,7 +32,7 @@ describe("currencyRate", () => {
   test("storing rate for the first time", async () => {
     (chrome.storage.local.get as jest.Mock).mockResolvedValue({});
     const result = await getCurrencyRate(message);
-    expect(result.data.rate).toBe(29991.836);
+    expect(result.data.rate).toBe(0.00029991836);
   });
 
   test("storing rate if it is outdated", async () => {
@@ -46,9 +46,9 @@ describe("currencyRate", () => {
     const result = await getCurrencyRate(message);
     expect(chrome.storage.local.set).toHaveBeenCalledWith({
       currencyRate:
-        '{"currency":"USD","rate":29991.836,"timestamp":1577836800000}',
+        '{"currency":"USD","rate":0.00029991836,"timestamp":1577836800000}',
     });
-    expect(result.data.rate).toBe(29991.836);
+    expect(result.data.rate).toBe(0.00029991836);
   });
 
   test("returning rate if still valid", async () => {
@@ -75,7 +75,7 @@ describe("currencyRate", () => {
     await getCurrencyRate(message);
     expect(chrome.storage.local.set).toHaveBeenCalledWith({
       currencyRate:
-        '{"currency":"USD","rate":29991.836,"timestamp":1577836800000}',
+        '{"currency":"USD","rate":0.00029991836,"timestamp":1577836800000}',
     });
   });
 });

src/extension/background-script/actions/cache/getCurrencyRate.ts

@@ -14,6 +14,8 @@ interface CurrencyRate {
   timestamp?: number;
 }
 
+export const numSatsInBtc = 100_000_000;
+
 const storeCurrencyRate = async ({ rate, currency }: CurrencyRate) => {
   const currencyRate: CurrencyRate = {
     currency,
@@ -37,22 +39,23 @@ const getFiatBtcRate = async (currency: CURRENCIES): Promise<number> => {
       `https://api.yadio.io/exrates/${currency.toLowerCase()}`
     );
     const data = await response?.data;
-    return data.BTC;
+    return data.BTC / numSatsInBtc;
   }
 
   if (exchange === "coindesk") {
     response = await axios.get(
       `https://api.coindesk.com/v1/bpi/currentprice/${currency.toLowerCase()}.json`
     );
     const data = await response?.data;
-    return data.bpi[currency].rate_float;
+    return data.bpi[currency].rate_float / numSatsInBtc;
   }
 
   response = await axios.get(
     `https://getalby.com/api/rates/${currency.toLowerCase()}.json`
   );
   const data = await response?.data;
-  return data[currency].rate_float;
+
+  return data[currency].rate_float / numSatsInBtc;
 };
 
 export const getCurrencyRateFromCache = async (currency: CURRENCIES) => {

src/extension/background-script/events/__test__/notifications.test.ts

@@ -14,7 +14,7 @@ import {
 
 jest.mock("~/extension/background-script/actions/cache/getCurrencyRate", () => {
   return {
-    getCurrencyRateFromCache: jest.fn(() => Promise.resolve(888.836)),
+    getCurrencyRateFromCache: jest.fn(() => Promise.resolve(0.00019233)),
   };
 });