Fix type definition

ZeusLN · Jan 16, 2025 · f5c6070 · f5c6070
1 parent 00d6dbb
commit f5c6070
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/stores/SwapStore.ts b/stores/SwapStore.ts
@@ -19,10 +19,12 @@ export default class SwapStore {
         let stateColor;
         switch (status) {
             case 'transaction.claimed':
+            case 'invoice.settled':
                 stateColor = 'green';
                 break;
             case 'invoice.failedToPay':
             case 'swap.expired':
+            case 'invoice.expired':
             case 'transaction.lockupFailed':
                 stateColor = themeColor('error');
                 break;

diff --git a/views/SwapDetails.tsx b/views/SwapDetails.tsx
@@ -36,18 +36,18 @@ interface SwapDetailsProps {
         {
             swapData: any;
             keys: any;
-            endpoint: any;
-            invoice: any;
-            feeRate: any;
+            endpoint: string;
+            invoice: string;
+            fee: string;
         }
     >;
     NodeInfoStore?: NodeInfoStore;
     SwapStore?: SwapStore;
 }
 
 interface SwapDetailsState {
-    updates: any;
-    error: any;
+    updates: string | null;
+    error: string | { message?: string } | null;
     loading: boolean;
 }
 
@@ -235,7 +235,7 @@ export default class SwapDetails extends React.Component<
         pollingInterval: number,
         isSubmarineSwap: boolean
     ) => {
-        const { keys, endpoint, swapData, feeRate } = this.props.route.params;
+        const { keys, endpoint, swapData, fee } = this.props.route.params;
 
         if (!createdResponse || !createdResponse.id) {
             console.error('Invalid response:', createdResponse);
@@ -302,7 +302,7 @@ export default class SwapDetails extends React.Component<
                         swapData.destinationAddress,
                         swapData.preimage,
                         data.transaction.hex,
-                        feeRate
+                        fee
                     );
                 } else if (
                     data.status === 'invoice.expired' ||
@@ -489,7 +489,7 @@ export default class SwapDetails extends React.Component<
         destinationAddress: string,
         preimage: any,
         transactionHex: string,
-        feeRate: any
+        fee: string
     ) => {
         try {
             const dObject = keys.__D;
@@ -516,7 +516,7 @@ export default class SwapDetails extends React.Component<
                     transactionHex,
                     lockupAddress,
                     destinationAddress,
-                    feeRate,
+                    feeRate: Number(fee),
                     isTestnet: this.props.NodeInfoStore!.nodeInfo.isTestNet
                 });
 
@@ -589,7 +589,11 @@ export default class SwapDetails extends React.Component<
                     {this.state.loading && <LoadingIndicator />}
                     {error && (
                         <ErrorMessage
-                            message={error?.message || String(error)}
+                            message={
+                                typeof error === 'object' && 'message' in error
+                                    ? error?.message
+                                    : String(error)
+                            }
                         />
                     )}
                     {updates && (

diff --git a/views/Swaps.tsx b/views/Swaps.tsx
@@ -272,7 +272,7 @@ export default class SwapPane extends React.PureComponent<
                         keys,
                         endpoint: HOST,
                         invoice: destinationAddress,
-                        feeRate: fee
+                        fee
                     });
                 });
             } catch (error: any) {