Fix AmountInput and update SwapDetails view

ZeusLN · Dec 9, 2024 · df172ee · df172ee
1 parent 3063d93
commit df172ee
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/components/AmountInput.tsx b/components/AmountInput.tsx
@@ -204,7 +204,13 @@ export default class AmountInput extends React.Component<
                     <TextInput
                         keyboardType="numeric"
                         placeholder={'0'}
-                        value={amount || sats ? getAmount(sats) : undefined}
+                        value={
+                            amount !== undefined
+                                ? amount
+                                : sats
+                                ? getAmount(sats)
+                                : undefined
+                        }
                         onChangeText={(text: string) => {
                             // remove spaces and non-numeric chars
                             const formatted = text.replace(/[^\d.,-]/g, '');

diff --git a/views/SwapDetails.tsx b/views/SwapDetails.tsx
@@ -24,7 +24,6 @@ import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
 
 import SwapStore from '../stores/SwapStore';
-import TransactionsStore from '../stores/TransactionsStore';
 
 import QR from '../assets/images/SVG/QR.svg';
 
@@ -34,7 +33,6 @@ interface SwapDetailsProps {
         'SwapDetails',
         { swapData: any; keys: any; endpoint: any; invoice: any }
     >;
-    TransactionsStore?: TransactionsStore;
     SwapStore?: SwapStore;
 }
 
@@ -44,13 +42,13 @@ interface SwapDetailsState {
     loading: boolean;
 }
 
-@inject('TransactionsStore', 'SwapStore')
+@inject('SwapStore')
 @observer
 export default class SwapDetails extends React.Component<
     SwapDetailsProps,
     SwapDetailsState
 > {
-    pollingTimer: NodeJS.Timeout | null = null;
+    pollingTimer: any = null;
 
     constructor(props: SwapDetailsProps) {
         super(props);
@@ -184,7 +182,8 @@ export default class SwapDetails extends React.Component<
                     );
                 } else if (
                     data.status === 'transaction.claimed' ||
-                    data.status === 'invoice.failedToPay'
+                    data.status === 'invoice.failedToPay' ||
+                    data.status === 'swap.expired'
                 ) {
                     this.stopPolling(); // Stop polling
                 } else {
@@ -348,7 +347,7 @@ export default class SwapDetails extends React.Component<
     };
 
     render() {
-        const { navigation, TransactionsStore, SwapStore } = this.props;
+        const { navigation, SwapStore } = this.props;
 
         const { updates, error } = this.state;
         const swapData = this.props.route.params?.swapData ?? '';
@@ -462,9 +461,10 @@ export default class SwapDetails extends React.Component<
                             paddingVertical: 10
                         }}
                         onPress={() => {
-                            console.log(swapData?.bip21);
-                            TransactionsStore?.sendCoins(swapData?.bip21);
-                            navigation.navigate('SendingOnChain');
+                            navigation.navigate('Send', {
+                                destination: swapData?.bip21,
+                                transactionType: 'On-chain'
+                            });
                         }}
                         secondary
                     />

diff --git a/views/Swaps.tsx b/views/Swaps.tsx
@@ -172,7 +172,7 @@ export default class SwapPane extends React.PureComponent<
                         invoice
                     });
                 });
-            } catch (error) {
+            } catch (error: any) {
                 // Handle errors during API call
                 this.setState({
                     apiError: error.message || 'An unknown error occurred'
@@ -204,7 +204,7 @@ export default class SwapPane extends React.PureComponent<
                 // Save the updated swaps array back to Encrypted Storage
                 await EncryptedStorage.setItem('swaps', JSON.stringify(swaps));
                 console.log('Swap saved successfully to Encrypted Storage.');
-            } catch (error) {
+            } catch (error: any) {
                 console.error('Error saving swap to storage:', error);
                 throw error;
             }