OnchainFeeInput: force users to set fee rate when suggestions disabled

ZeusLN · Oct 26, 2024 · cb222ee · cb222ee
1 parent 6c60627
commit cb222ee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/components/OnchainFeeInput.tsx b/components/OnchainFeeInput.tsx
@@ -47,8 +47,6 @@ export default function OnchainFeeInput(props: OnchainFeeInputProps) {
                     setErrorOccurredLoadingFees(true);
                     setLoading(false);
                 });
-        } else {
-            onChangeFee(DEFAULT_FEE);
         }
     }, []);
 
@@ -107,6 +105,7 @@ export default function OnchainFeeInput(props: OnchainFeeInputProps) {
                         setNewFee(text);
                         onChangeFee(text);
                     }}
+                    error={!newFee || newFee === '0'}
                 />
             )}
         </>

diff --git a/views/Channels/Channel.tsx b/views/Channels/Channel.tsx
@@ -800,7 +800,7 @@ export default class ChannelView extends React.Component<
                                             deliveryAddress
                                         )
                                     }
-                                    disabled={satPerByte === '0'}
+                                    disabled={satPerByte === '0' || !satPerByte}
                                     warning
                                 />
                             </View>

diff --git a/views/OpenChannel.tsx b/views/OpenChannel.tsx
@@ -111,7 +111,7 @@ export default class OpenChannel extends React.Component<
             satAmount: '',
             min_confs: 1,
             spend_unconfirmed: false,
-            sat_per_vbyte: '2',
+            sat_per_vbyte: '',
             privateChannel: true,
             scidAlias: true,
             simpleTaprootChannel: false,
@@ -1027,7 +1027,7 @@ export default class OpenChannel extends React.Component<
                                     name: 'swap-horiz',
                                     size: 25,
                                     color:
-                                        sat_per_vbyte === '0'
+                                        sat_per_vbyte === '0' || !sat_per_vbyte
                                             ? themeColor('secondaryText')
                                             : themeColor('background')
                                 }}
@@ -1047,7 +1047,8 @@ export default class OpenChannel extends React.Component<
                                     );
                                 }}
                                 disabled={
-                                    !connectPeerOnly && sat_per_vbyte === '0'
+                                    !connectPeerOnly &&
+                                    (sat_per_vbyte === '0' || !sat_per_vbyte)
                                 }
                             />
                         </View>

diff --git a/views/Send.tsx b/views/Send.tsx
@@ -158,7 +158,7 @@ export default class Send extends React.Component<SendProps, SendState> {
             destination: destination || '',
             amount: amount || '',
             satAmount: '',
-            fee: '2',
+            fee: '',
             utxos: [],
             utxoBalance: 0,
             confirmationTarget: '60',
@@ -1250,7 +1250,9 @@ export default class Send extends React.Component<SendProps, SendState> {
                                             size: 25,
                                             color:
                                                 totalBlockchainBalanceAccounts ===
-                                                    0 || fee === '0'
+                                                    0 ||
+                                                fee === '0' ||
+                                                !fee
                                                     ? themeColor(
                                                           'secondaryText'
                                                       )
@@ -1261,7 +1263,9 @@ export default class Send extends React.Component<SendProps, SendState> {
                                         }
                                         disabled={
                                             totalBlockchainBalanceAccounts ===
-                                                0 || fee === '0'
+                                                0 ||
+                                            fee === '0' ||
+                                            !fee
                                         }
                                     />
                                 </View>
-Original file line number
+Diff line change
@@ Expand Up / @@ -800,7 +800,7 @@ export default class ChannelView extends React.Component< @@
                                                 deliveryAddress
                                             )
                                         }
-                                        disabled={satPerByte === '0'}
+                                        disabled={satPerByte === '0' || !satPerByte}
                                         warning
                                     />
                                 </View>
@@ Expand Down @@