refactor: move utils/helpers around, split into files (#1020)

Author: sidvishnoi

src/background/services/background.ts

@@ -1,12 +1,10 @@
 import type { Browser, Runtime } from 'webextension-polyfill';
-import type { ToBackgroundMessage } from '@/shared/messages';
+import { failure, success, type ToBackgroundMessage } from '@/shared/messages';
 import {
   errorWithKeyToJSON,
-  failure,
   getNextOccurrence,
   getWalletInformation,
   isErrorWithKey,
-  success,
 } from '@/shared/helpers';
 import { KeyAutoAddService } from '@/background/services/keyAutoAdd';
 import { OpenPaymentsClientError } from '@interledger/open-payments/dist/client/error';

src/background/services/paymentSession.ts

@@ -5,13 +5,7 @@ import {
   type OutgoingPaymentWithSpentAmounts as OutgoingPayment,
   type WalletAddress,
 } from '@interledger/open-payments';
-import {
-  bigIntMax,
-  convert,
-  ErrorWithKey,
-  sleep,
-  transformBalance,
-} from '@/shared/helpers';
+import { ErrorWithKey, sleep, transformBalance } from '@/shared/helpers';
 import {
   isInternalServerError,
   isInvalidReceiverError,
@@ -21,7 +15,7 @@ import {
   isOutOfBalanceError,
   isTokenExpiredError,
 } from '@/background/services/openPayments';
-import { getNextSendableAmount } from '@/background/utils';
+import { bigIntMax, convert, getNextSendableAmount } from '@/background/utils';
 import type {
   EventsService,
   OpenPaymentsService,

src/background/services/storage.ts

@@ -7,8 +7,8 @@ import type {
   StorageKey,
   WalletAmount,
 } from '@/shared/types';
-import { bigIntMax, objectEquals, ThrottleBatch } from '@/shared/helpers';
-import { computeBalance } from '../utils';
+import { objectEquals, ThrottleBatch } from '@/shared/helpers';
+import { bigIntMax, computeBalance } from '../utils';
 import type { Cradle } from '../container';
 
 const defaultStorage = {

src/background/utils.ts

@@ -66,6 +66,10 @@ export const toAmount = ({
   };
 };
 
+export function bigIntMax<T extends bigint | AmountValue>(a: T, b: T): T {
+  return BigInt(a) > BigInt(b) ? a : b;
+}
+
 interface ExchangeRates {
   base: string;
   rates: Record<string, number>;
@@ -124,6 +128,14 @@ export const convertWithExchangeRate = <T extends AmountValue | bigint>(
     : (converted as T);
 };
 
+export function convert(value: bigint, source: number, target: number) {
+  const scaleDiff = target - source;
+  if (scaleDiff > 0) {
+    return value * BigInt(10 ** scaleDiff);
+  }
+  return value / BigInt(10 ** -scaleDiff);
+}
+
 export const getTabId = (sender: Runtime.MessageSender): number => {
   return notNullOrUndef(notNullOrUndef(sender.tab, 'sender.tab').id, 'tab.id');
 };

src/content/__tests__/monetizationLinkManager.test.ts

@@ -1,7 +1,7 @@
 import { promisify } from 'node:util';
 import { JSDOM } from 'jsdom';
 import { MonetizationLinkManager } from '@/content/services/monetizationLinkManager';
-import { success, failure } from '@/shared/helpers';
+import { success, failure } from '@/shared/messages';
 import type {
   ContentToBackgroundMessage as Msg,
   MessageManager,

src/content/keyAutoAdd/testWallet.ts

@@ -1,13 +1,17 @@
 // cSpell:ignore nextjs
-import { errorWithKey, ErrorWithKey, sleep } from '@/shared/helpers';
+import {
+  errorWithKey,
+  ErrorWithKey,
+  sleep,
+  toWalletAddressUrl,
+} from '@/shared/helpers';
 import {
   KeyAutoAdd,
   LOGIN_WAIT_TIMEOUT,
   type StepRun as Run,
 } from './lib/keyAutoAdd';
 import { isTimedOut, waitForURL } from './lib/helpers';
 import { revokeKey } from './lib/helpers/testWallet';
-import { toWalletAddressUrl } from '@/pages/shared/lib/utils';
 
 // region: Steps
 type Account = {

src/content/services/contentScript.ts

@@ -1,6 +1,6 @@
 import type { ToContentMessage } from '@/shared/messages';
 import type { Cradle } from '@/content/container';
-import { failure, success } from '@/shared/helpers';
+import { failure, success } from '@/shared/messages';
 
 export class ContentScript {
   private browser: Cradle['browser'];

src/pages/app/pages/PostInstall.tsx

@@ -5,13 +5,13 @@ import {
   ExternalIcon,
 } from '@/pages/shared/components/Icons';
 import {
-  cn,
   getBrowserName,
   getWalletInformation,
   type BrowserName,
 } from '@/shared/helpers';
 import { useBrowser, useTranslation } from '@/app/lib/context';
 import { ConnectWalletForm } from '@/popup/components/ConnectWalletForm';
+import { cn } from '@/pages/shared/lib/utils';
 import { useMessage } from '@/app/lib/context';
 import { useAppState } from '@/app/lib/store';
 

src/pages/popup/components/ConnectWalletForm.tsx

@@ -10,14 +10,14 @@ import {
   InputAmount,
   validateAmount,
 } from '@/pages/shared/components/InputAmount';
-import { toWalletAddressUrl } from '@/pages/shared/lib/utils';
+import { cn } from '@/pages/shared/lib/utils';
 import { useTranslation } from '@/popup/lib/context';
 import { deepClone } from 'valtio/utils';
 import {
-  cn,
   errorWithKey,
   isErrorWithKey,
   sleep,
+  toWalletAddressUrl,
   type ErrorWithKeyLike,
 } from '@/shared/helpers';
 import type { WalletAddress } from '@interledger/open-payments';

src/pages/popup/components/PayWebsiteForm.tsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { Button } from '@/pages/shared/components/ui/Button';
 import { InputAmount } from '@/pages/shared/components/InputAmount';
 import { FadeInOut } from '@/pages/shared/components/FadeInOut';
-import { roundWithPrecision } from '@/pages/shared/lib/utils';
-import { cn, type ErrorWithKeyLike } from '@/shared/helpers';
+import { roundWithPrecision, cn } from '@/pages/shared/lib/utils';
+import type { ErrorWithKeyLike } from '@/shared/helpers';
 import { useMessage, useTranslation } from '@/popup/lib/context';
 import { usePopupState } from '@/popup/lib/store';