avoid calling updateSettings() with wrong values (#2806)

ZeusLN · Feb 6, 2025 · 08f39ee · 08f39ee
2 parents d8ae7a9 + bdaa389
commit 08f39ee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 42 deletions.
diff --git a/components/AmountInput.tsx b/components/AmountInput.tsx
@@ -87,20 +87,18 @@ export default class AmountInput extends React.Component<
     constructor(props: any) {
         super(props);
 
-        const { amount, onAmountChange } = props;
+        const { amount } = props;
         let satAmount = '0';
         if (amount) satAmount = getSatAmount(amount).toString();
 
-        onAmountChange(amount, satAmount);
         this.state = {
             satAmount
         };
     }
 
     componentDidMount() {
-        const { amount, onAmountChange }: any = this.props;
+        const { amount }: any = this.props;
         const satAmount = getSatAmount(amount);
-        onAmountChange(amount, satAmount);
         this.setState({ satAmount });
     }
 

diff --git a/views/Settings/PaymentsSettings.tsx b/views/Settings/PaymentsSettings.tsx
@@ -79,7 +79,6 @@ export default class PaymentsSettings extends React.Component<
         const { navigation } = this.props;
         const {
             feeLimit,
-            feeLimitMethod,
             feePercentage,
             enableMempoolRates,
             timeoutSeconds,
@@ -139,12 +138,9 @@ export default class PaymentsSettings extends React.Component<
                                         });
                                         await updateSettings({
                                             payments: {
+                                                ...settings.payments,
                                                 defaultFeeMethod: 'fixed',
-                                                defaultFeePercentage:
-                                                    feePercentage,
-                                                defaultFeeFixed: text,
-                                                timeoutSeconds,
-                                                preferredMempoolRate
+                                                defaultFeeFixed: text
                                             }
                                         });
                                     }}
@@ -178,11 +174,9 @@ export default class PaymentsSettings extends React.Component<
                                         });
                                         await updateSettings({
                                             payments: {
+                                                ...settings.payments,
                                                 defaultFeeMethod: 'percent',
-                                                defaultFeePercentage: text,
-                                                defaultFeeFixed: feeLimit,
-                                                timeoutSeconds,
-                                                preferredMempoolRate
+                                                defaultFeePercentage: text
                                             }
                                         });
                                     }}
@@ -248,11 +242,9 @@ export default class PaymentsSettings extends React.Component<
                                         });
                                         await updateSettings({
                                             payments: {
+                                                ...settings.payments,
                                                 defaultFeeMethod: 'percent',
-                                                defaultFeePercentage: text,
-                                                defaultFeeFixed: feeLimit,
-                                                timeoutSeconds,
-                                                preferredMempoolRate
+                                                defaultFeePercentage: text
                                             }
                                         });
                                     }}
@@ -294,11 +286,7 @@ export default class PaymentsSettings extends React.Component<
                             if (!Number.isNaN(amountNumber)) {
                                 await updateSettings({
                                     payments: {
-                                        defaultFeeMethod: feeLimitMethod,
-                                        defaultFeePercentage: feePercentage,
-                                        defaultFeeFixed: feeLimit,
-                                        timeoutSeconds,
-                                        preferredMempoolRate,
+                                        ...settings.payments,
                                         slideToPayThreshold: Number(amount)
                                     }
                                 });
@@ -331,11 +319,8 @@ export default class PaymentsSettings extends React.Component<
                                     });
                                     await updateSettings({
                                         payments: {
-                                            defaultFeeMethod: feeLimitMethod,
-                                            defaultFeePercentage: feePercentage,
-                                            defaultFeeFixed: feeLimit,
-                                            timeoutSeconds: text,
-                                            preferredMempoolRate
+                                            ...settings.payments,
+                                            timeoutSeconds: text
                                         }
                                     });
                                 }}
@@ -368,16 +353,7 @@ export default class PaymentsSettings extends React.Component<
                                     });
                                     await updateSettings({
                                         privacy: {
-                                            defaultBlockExplorer:
-                                                settings?.privacy
-                                                    ?.defaultBlockExplorer,
-                                            customBlockExplorer:
-                                                settings?.privacy
-                                                    ?.customBlockExplorer,
-                                            clipboard:
-                                                settings?.privacy?.clipboard,
-                                            lurkerMode:
-                                                settings?.privacy?.lurkerMode,
+                                            ...settings.privacy,
                                             enableMempoolRates:
                                                 !enableMempoolRates
                                         }
@@ -398,10 +374,7 @@ export default class PaymentsSettings extends React.Component<
                                 });
                                 await updateSettings({
                                     payments: {
-                                        defaultFeeMethod: feeLimitMethod,
-                                        defaultFeePercentage: feePercentage,
-                                        defaultFeeFixed: feeLimit,
-                                        timeoutSeconds,
+                                        ...settings.payments,
                                         preferredMempoolRate: value
                                     }
                                 });