Merge pull request #2741 from shubhamkmr04/shubham/more-swap-updates

[swaps] Enhancements
ZeusLN · Jan 16, 2025 · d14c642 · d14c642
2 parents b75c3dd + f5c6070
commit d14c642
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 14 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
@@ -33,15 +33,21 @@ interface SwapDetailsProps {
     navigation: StackNavigationProp<any, any>;
     route: Route<
         'SwapDetails',
-        { swapData: any; keys: any; endpoint: any; invoice: any }
+        {
+            swapData: any;
+            keys: 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;
 }
 
@@ -229,7 +235,7 @@ export default class SwapDetails extends React.Component<
         pollingInterval: number,
         isSubmarineSwap: boolean
     ) => {
-        const { keys, endpoint, swapData } = this.props.route.params;
+        const { keys, endpoint, swapData, fee } = this.props.route.params;
 
         if (!createdResponse || !createdResponse.id) {
             console.error('Invalid response:', createdResponse);
@@ -295,7 +301,8 @@ export default class SwapDetails extends React.Component<
                         swapData.lockupAddress,
                         swapData.destinationAddress,
                         swapData.preimage,
-                        data.transaction.hex
+                        data.transaction.hex,
+                        fee
                     );
                 } else if (
                     data.status === 'invoice.expired' ||
@@ -481,7 +488,8 @@ export default class SwapDetails extends React.Component<
         lockupAddress: string,
         destinationAddress: string,
         preimage: any,
-        transactionHex: string
+        transactionHex: string,
+        fee: string
     ) => {
         try {
             const dObject = keys.__D;
@@ -508,7 +516,7 @@ export default class SwapDetails extends React.Component<
                     transactionHex,
                     lockupAddress,
                     destinationAddress,
-                    feeRate: 2, // TODO
+                    feeRate: Number(fee),
                     isTestnet: this.props.NodeInfoStore!.nodeInfo.isTestNet
                 });
 
@@ -581,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
@@ -25,6 +25,7 @@ import {
     ErrorMessage,
     SuccessMessage
 } from '../components/SuccessErrorMessage';
+import OnchainFeeInput from '../components/OnchainFeeInput';
 
 import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
@@ -58,6 +59,7 @@ interface SwapPaneState {
     apiUpdates: any;
     response: any;
     fetchingInvoice: boolean;
+    fee: string;
 }
 
 @inject('SwapStore', 'UnitsStore', 'InvoicesStore')
@@ -76,7 +78,8 @@ export default class SwapPane extends React.PureComponent<
         apiUpdates: '',
         apiError: null,
         response: null,
-        fetchingInvoice: false
+        fetchingInvoice: false,
+        fee: ''
     };
 
     async UNSAFE_componentWillMount() {
@@ -94,7 +97,8 @@ export default class SwapPane extends React.PureComponent<
             apiUpdates,
             invoice,
             isValid,
-            fetchingInvoice
+            fetchingInvoice,
+            fee
         } = this.state;
         const { subInfo, reverseInfo, loading } = SwapStore;
         const info: any = reverse ? reverseInfo : subInfo;
@@ -267,7 +271,8 @@ export default class SwapPane extends React.PureComponent<
                         swapData: responseData,
                         keys,
                         endpoint: HOST,
-                        invoice: destinationAddress
+                        invoice: destinationAddress,
+                        fee
                     });
                 });
             } catch (error: any) {
@@ -904,6 +909,23 @@ export default class SwapPane extends React.PureComponent<
                                     disabled={errorMsg}
                                 />
                             </View>
+                            <View style={{ paddingHorizontal: 20 }}>
+                                <Text
+                                    style={{
+                                        color: themeColor('secondaryText'),
+                                        marginTop: 10
+                                    }}
+                                >
+                                    {localeString('views.Send.feeSatsVbyte')}
+                                </Text>
+                                <OnchainFeeInput
+                                    fee={fee}
+                                    onChangeFee={(text: string) =>
+                                        this.setState({ fee: text })
+                                    }
+                                    navigation={navigation}
+                                />
+                            </View>
 
                             <View>
                                 <Button
@@ -914,9 +936,6 @@ export default class SwapPane extends React.PureComponent<
                                             ? createReverseSwap(invoice)
                                             : createSubmarineSwap(invoice);
                                     }}
-                                    containerStyle={{
-                                        marginTop: 10
-                                    }}
                                     disabled={!isValid}
                                 />
                             </View>