Merge branch 'frontend-lint-with-stylistic'

Author: thisconnect

frontends/web/eslint.config.mjs

@@ -26,7 +26,6 @@ export default tseslint.config(
       'brace-style': ['error', '1tbs'],
       'comma-spacing': ['error', { 'before': false, 'after': true }],
       'curly': 'error',
-      'indent': ['error', 2, { 'SwitchCase': 0 }],
       'jsx-a11y/anchor-is-valid': 0,
       'jsx-a11y/alt-text' : 0,
       'jsx-quotes': ['error', 'prefer-double'],
@@ -36,7 +35,6 @@ export default tseslint.config(
       'no-trailing-spaces': 'error',
       'object-curly-spacing': ['error', 'always'],
       'quotes': ['error', 'single'],
-      'semi': 'error',
       'space-before-blocks': ['error', 'always'],
       'space-in-parens': ['error', 'never'],
       'no-extra-semi': 'error',
@@ -63,6 +61,19 @@ export default tseslint.config(
         'logical': 'parens-new-line'
       }],
       '@stylistic/type-generic-spacing': ['error'],
+      '@stylistic/indent': ['error', 2, { "SwitchCase": 0 }],
+      '@stylistic/semi': ["error", "always"],
+      '@stylistic/member-delimiter-style': ['error', {
+        "multiline": {
+          "delimiter": "semi",
+          "requireLast": true
+        },
+        "singleline": {
+          "delimiter": "semi",
+          "requireLast": false
+        },
+        "multilineDetection": "brackets"
+      }],
     },
   },
   {

frontends/web/src/api/account.ts

@@ -27,7 +27,7 @@ export type AccountCode = string;
 
 export type Fiat = 'AUD' | 'BRL' | 'BTC' | 'CAD' | 'CHF' | 'CNY' | 'CZK' | 'EUR' | 'GBP' | 'HKD' | 'ILS' | 'JPY' | 'KRW' | 'NOK' | 'NZD' | 'PLN' | 'RUB' | 'sat' | 'SEK' | 'SGD' | 'USD';
 
-export type ConversionUnit = Fiat | 'sat'
+export type ConversionUnit = Fiat | 'sat';
 
 export type CoinUnit = 'BTC' | 'sat' | 'LTC' | 'ETH' | 'TBTC' | 'tsat' | 'TLTC' | 'SEPETH';
 
@@ -40,7 +40,7 @@ export type CoinCode = NativeCoinCode | ERC20CoinCode;
 export type FiatWithDisplayName = {
   currency: Fiat;
   displayName: string;
-}
+};
 
 export type Terc20Token = {
   code: ERC20CoinCode;
@@ -51,7 +51,7 @@ export type Terc20Token = {
 export type TActiveToken = {
   tokenCode: ERC20CoinCode;
   accountCode: AccountCode;
-}
+};
 
 export type TKeystore = {
   watchonly: boolean;
@@ -74,7 +74,7 @@ export type TAccount = {
   activeTokens?: TActiveToken[];
   blockExplorerTxPrefix: string;
   bitsuranceStatus?: TDetailStatus;
-}
+};
 
 export const getAccounts = (): Promise<TAccount[]> => {
   return apiGet('accounts');
@@ -110,7 +110,7 @@ export type TAccountsBalanceSummaryResponse = {
   accountsBalanceSummary: TAccountsBalanceSummary;
 } | {
   success: false;
-}
+};
 
 export const getAccountsBalanceSummary = (): Promise<TAccountsBalanceSummaryResponse> => {
   return apiGet('accounts/balance-summary');
@@ -119,7 +119,7 @@ export const getAccountsBalanceSummary = (): Promise<TAccountsBalanceSummaryResp
 type TEthAccountCodeAndNameByAddress = SuccessResponse & {
   code: AccountCode;
   name: string;
-}
+};
 
 export const getEthAccountCodeAndNameByAddress = (address: string): Promise<TEthAccountCodeAndNameByAddress> => {
   return apiPost('accounts/eth-account-code', { address });
@@ -130,7 +130,7 @@ export type TStatus = {
   synced: boolean;
   fatalError: boolean;
   offlineError: string | null;
-}
+};
 
 export const getStatus = (code: AccountCode): Promise<TStatus> => {
   return apiGet(`account/${code}/status`);
@@ -144,28 +144,28 @@ type TKeyInfo = {
   keypath: string;
   rootFingerprint: string;
   xpub: string;
-}
+};
 
 export type TBitcoinSimple = {
   keyInfo: TKeyInfo;
   scriptType: ScriptType;
-}
+};
 
 export type TEthereumSimple = {
   keyInfo: TKeyInfo;
-}
+};
 
 export type TSigningConfiguration = {
   bitcoinSimple: TBitcoinSimple;
   ethereumSimple?: never;
 } | {
   bitcoinSimple?: never;
   ethereumSimple: TEthereumSimple;
-}
+};
 
 export type TSigningConfigurationList = null | {
   signingConfigurations: TSigningConfiguration[];
-}
+};
 
 export const getInfo = (code: AccountCode) => {
   return (): Promise<TSigningConfigurationList> => {
@@ -188,7 +188,7 @@ type TChartDataResponse = {
   data: TChartData;
 } | {
   success: false;
-}
+};
 
 export type TChartData = {
   chartDataMissing: boolean;
@@ -199,7 +199,7 @@ export type TChartData = {
   formattedChartTotal: string | null;
   chartIsUpToDate: boolean; // only valid if chartDataMissing is false
   lastTimestamp: number;
-}
+};
 
 export const getChartData = (): Promise<TChartDataResponse> => {
   return apiGet('chart-data');
@@ -228,7 +228,7 @@ type TBalanceResponse = {
   balance: TBalance;
 } | {
   success: false;
-}
+};
 
 export const getBalance = (code: AccountCode): Promise<TBalanceResponse> => {
   return apiGet(`account/${code}/balance`);
@@ -257,14 +257,14 @@ export type TTransaction = {
   txID: string;
   vsize: number;
   weight: number;
-}
+};
 
-export type TTransactions = { success: false } | { success: true; list: TTransaction[]; };
+export type TTransactions = { success: false } | { success: true; list: TTransaction[] };
 
 type TNoteTx = {
   internalTxID: string;
   note: string;
-}
+};
 
 export const postNotesTx = (code: AccountCode, {
   internalTxID,
@@ -285,7 +285,7 @@ type TExport = {
   success: boolean;
   path: string;
   errorMessage: string;
-}
+};
 
 export const exportAccount = (code: AccountCode): Promise<TExport | null> => {
   return apiPost(`account/${code}/export`);
@@ -294,19 +294,19 @@ export const exportAccount = (code: AccountCode): Promise<TExport | null> => {
 export const verifyXPub = (
   code: AccountCode,
   signingConfigIndex: number,
-): Promise<{ success: true; } | { success: false; errorMessage: string; }> => {
+): Promise<{ success: true } | { success: false; errorMessage: string }> => {
   return apiPost(`account/${code}/verify-extended-public-key`, { signingConfigIndex });
 };
 
 export type TReceiveAddress = {
   addressID: string;
   address: string;
-}
+};
 
 export type TReceiveAddressList = {
   scriptType: ScriptType | null;
   addresses: NonEmptyArray<TReceiveAddress>;
-}
+};
 
 export const getReceiveAddressList = (code: AccountCode) => {
   return (): Promise<NonEmptyArray<TReceiveAddressList> | null> => {
@@ -371,12 +371,12 @@ export type FeeTargetCode = 'custom' | 'low' | 'economy' | 'normal' | 'high' | '
 export type TFeeTarget = {
   code: FeeTargetCode;
   feeRateInfo: string;
-}
+};
 
 export type TFeeTargetList = {
   feeTargets: TFeeTarget[];
   defaultFeeTarget: FeeTargetCode;
-}
+};
 
 export const getFeeTargetList = (code: AccountCode): Promise<TFeeTargetList> => {
   return apiGet(`account/${code}/fee-targets`);
@@ -429,7 +429,7 @@ export type TAddAccount = {
   accountCode?: string;
   errorCode?: 'accountAlreadyExists' | 'accountLimitReached';
   errorMessage?: string;
-}
+};
 
 export const addAccount = (coinCode: string, name: string): Promise<TAddAccount> => {
   return apiPost('account-add', {
@@ -438,7 +438,7 @@ export const addAccount = (coinCode: string, name: string): Promise<TAddAccount>
   });
 };
 
-export type TSignMessage = { success: false, aborted?: boolean; errorMessage?: string; } | { success: true; signature: string; }
+export type TSignMessage = { success: false; aborted?: boolean; errorMessage?: string } | { success: true; signature: string };
 
 export type TSignWalletConnectTx = {
   success: false;
@@ -448,7 +448,7 @@ export type TSignWalletConnectTx = {
   success: true;
   txHash: string;
   rawTx: string;
-}
+};
 
 export const ethSignMessage = (code: AccountCode, message: string): Promise<TSignMessage> => {
   return apiPost(`account/${code}/eth-sign-msg`, message);
@@ -470,7 +470,7 @@ type AddressSignResponse = {
   success: false;
   errorMessage?: string;
   errorCode?: 'userAbort' | 'wrongKeystore';
-}
+};
 
 export const signAddress = (format: ScriptType | '', msg: string, code: AccountCode): Promise<AddressSignResponse> => {
   return apiPost(`account/${code}/sign-address`, { format, msg, code });

frontends/web/src/api/aopp.ts

@@ -23,7 +23,7 @@ import { subscribeEndpoint } from './subscribe';
 type TAccount = {
   name: string;
   code: AccountCode;
-}
+};
 
 type Accounts = NonEmptyArray<TAccount>;
 

frontends/web/src/api/backend.ts

@@ -24,7 +24,7 @@ export type TCoin = {
   name: string;
   canAddAccount: boolean;
   suggestedAccountName: string;
-}
+};
 
 // In other places we use type { FailResponse, SuccessResponse } from './response'
 // which has slightly different FailResponse structure ( message?: string; code?: number)
@@ -33,7 +33,7 @@ type TSuccess = {
   success: boolean;
   errorMessage?: string;
   errorCode?: string;
-}
+};
 
 export const getSupportedCoins = (): Promise<TCoin[]> => {
   return apiGet('supported-coins');
@@ -67,7 +67,7 @@ export const getDevServers = (): Promise<boolean> => {
   return apiGet('dev-servers');
 };
 
-type TQRCode = FailResponse | (SuccessResponse & { data: string; });
+type TQRCode = FailResponse | (SuccessResponse & { data: string });
 
 export const getQRCode = (data: string) => {
   return (): Promise<TQRCode> => {
@@ -147,7 +147,7 @@ export const exportLogs = (): Promise<TSuccess> => {
   return apiPost('export-log');
 };
 
-export const exportNotes = (): Promise<(FailResponse & { aborted: boolean; }) | SuccessResponse> => {
+export const exportNotes = (): Promise<(FailResponse & { aborted: boolean }) | SuccessResponse> => {
   return apiPost('notes/export');
 };
 
@@ -156,7 +156,7 @@ type TImportNotes = {
   transactionCount: number;
 };
 
-export const importNotes = (fileContents: ArrayBuffer): Promise<FailResponse | (SuccessResponse & { data: TImportNotes; })> => {
+export const importNotes = (fileContents: ArrayBuffer): Promise<FailResponse | (SuccessResponse & { data: TImportNotes })> => {
   const hexString = Array.from(new Uint8Array(fileContents))
     .map(byte => byte.toString(16).padStart(2, '0'))
     .join('');

frontends/web/src/api/backup.ts

@@ -27,7 +27,7 @@ export type Backup = {
 type BackupResponse = {
   success: true;
   backups: Backup[];
-}
+};
 
 export const getBackupList = (
   deviceID: string

frontends/web/src/api/backupBanner.ts

@@ -24,7 +24,7 @@ export type TShowBackupBannerResponse = {
   success: true;
   show: boolean;
   fiat: Fiat;
-  threshold: string
+  threshold: string;
 };
 
 export const getShowBackupBanner = (rootFingerprint: string): Promise<TShowBackupBannerResponse> => {

frontends/web/src/api/banners.ts

@@ -20,14 +20,14 @@ import { subscribeEndpoint, TUnsubscribe } from './subscribe';
 
 export type TBannerInfo = {
   id: string;
-  message: { [key: string]: string; };
+  message: { [key: string]: string };
   link?: {
     href: string;
     text?: string;
   };
   dismissible?: boolean;
   type?: TMessageTypes;
-}
+};
 
 export const getBanner = (msgKey: string): Promise<TBannerInfo> => {
   return apiGet(`banners/${msgKey}`);

frontends/web/src/api/bitbox02.ts

@@ -32,7 +32,7 @@ export type DeviceInfo = {
     firmwareVersion: string;
     enabled: boolean;
   };
-}
+};
 
 type DeviceInfoResponse = SuccessResponse & {
   deviceInfo: DeviceInfo;
@@ -82,11 +82,11 @@ type VersionInfoCommon = {
   canBackupWithRecoveryWords: boolean;
   canCreate12Words: boolean;
   canBIP85: boolean;
-}
+};
 
 export type VersionInfo = VersionInfoCommon & (
-  { canUpgrade: true, newVersion: string; } |
-  { canUpgrade: false; })
+  { canUpgrade: true; newVersion: string } |
+  { canUpgrade: false });
 
 export const getVersion = (
   deviceID: string
@@ -110,7 +110,7 @@ export const verifyAttestation = (
 export const checkBackup = (
   deviceID: string,
   silent: boolean,
-): Promise<FailResponse | (SuccessResponse & { backupID: string; })> => {
+): Promise<FailResponse | (SuccessResponse & { backupID: string })> => {
   return apiPost(`devices/bitbox02/${deviceID}/backups/check`, { silent });
 };