Merge branch 'frontend-fix-types'

BitBoxSwiss · Oct 10, 2024 · c4867b8 · c4867b8
2 parents c452561 + b61a18a
commit c4867b8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/frontends/web/src/api/account.ts b/frontends/web/src/api/account.ts
@@ -236,6 +236,9 @@ export const getBalance = (code: AccountCode): Promise<IBalance> => {
   return apiGet(`account/${code}/balance`);
 };
 
+export type TTransactionStatus = 'complete' | 'pending' | 'failed';
+export type TTransactionType = 'send' | 'receive' | 'send_to_self';
+
 export interface ITransaction {
     addresses: string[];
     amount: IAmount;
@@ -249,9 +252,9 @@ export interface ITransaction {
     numConfirmations: number;
     numConfirmationsComplete: number;
     size: number;
-    status: 'complete' | 'pending' | 'failed';
+    status: TTransactionStatus;
     time: string | null;
-    type: 'send' | 'receive' | 'self';
+    type: TTransactionType;
     txID: string;
     vsize: number;
     weight: number;
@@ -374,8 +377,8 @@ export interface IFeeTarget {
 }
 
 export interface IFeeTargetList {
-    feeTargets: IFeeTarget[],
-    defaultFeeTarget: FeeTargetCode
+    feeTargets: IFeeTarget[];
+    defaultFeeTarget: FeeTargetCode;
 }
 
 export const getFeeTargetList = (code: AccountCode): Promise<IFeeTargetList> => {
@@ -443,7 +446,7 @@ export const connectKeystore = (code: AccountCode): Promise<{ success: boolean;
 export type TSignMessage = { success: false, aborted?: boolean; errorMessage?: string; } | { success: true; signature: string; }
 
 export type TSignWalletConnectTx = {
-  success: false,
+  success: false;
   aborted?: boolean;
   errorMessage?: string;
 } | {

diff --git a/frontends/web/src/components/transactions/components/arrow.tsx b/frontends/web/src/components/transactions/components/arrow.tsx
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-import type { ITransaction } from '@/api/account';
+import type { TTransactionStatus, TTransactionType } from '@/api/account';
 import { Warning } from '@/components/icon/icon';
 import { ArrowIn, ArrowOut, ArrowSelf } from './icons';
 
-type TProps = Pick<ITransaction, 'status' | 'type'>;
+type TProps = {
+  status: TTransactionStatus;
+  type: TTransactionType;
+};
 
 export const Arrow = ({ status, type }: TProps) => {
   if (status === 'failed') {

diff --git a/frontends/web/src/components/transactions/components/details.tsx b/frontends/web/src/components/transactions/components/details.tsx
@@ -16,7 +16,7 @@
 
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ITransaction, IAmount, getTransaction } from '@/api/account';
+import { ITransaction, IAmount, getTransaction, TTransactionStatus, TTransactionType } from '@/api/account';
 import { A } from '@/components/anchor/anchor';
 import { Dialog } from '@/components/dialog/dialog';
 import { FiatConversion } from '@/components/rates/rates';
@@ -35,8 +35,8 @@ type TProps = {
   accountCode: string;
   internalID: string;
   note: string;
-  status: ITransaction['status'];
-  type: ITransaction['type'];
+  status: TTransactionStatus;
+  type: TTransactionType;
   numConfirmations: number;
   numConfirmationsComplete: number;
   time: string | null;

diff --git a/frontends/web/src/components/transactions/components/status.tsx b/frontends/web/src/components/transactions/components/status.tsx
@@ -15,14 +15,14 @@
  */
 
 import { useTranslation } from 'react-i18next';
-import type { ITransaction } from '@/api/account';
+import type { TTransactionStatus } from '@/api/account';
 import { ProgressRing } from '@/components/progressRing/progressRing';
 import { TxDetail } from './detail';
 import transactionStyle from '@/components/transactions/transactions.module.css';
 import parentStyle from '@/components/transactions/transaction.module.css';
 
 type TProps = {
-  status: ITransaction['status'];
+  status: TTransactionStatus;
   numConfirmations: number;
   numConfirmationsComplete: number;
 }