Merge pull request #2046 from kaloudis/send-receive-hide-buttons

Send/receive: hide select buttons when loading
ZeusLN · Mar 11, 2024 · c296122 · c296122
2 parents 09967e0 + 5ee1680
commit c296122
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 48 deletions.
diff --git a/views/PaymentRequest.tsx b/views/PaymentRequest.tsx
@@ -1045,52 +1045,55 @@ export default class PaymentRequest extends React.Component<
                     </ScrollView>
                 </View>
 
-                {!!pay_req && BackendUtils.supportsLightningSends() && (
-                    <View style={{ bottom: 10 }}>
-                        <View style={styles.button}>
-                            <Button
-                                title={localeString(
-                                    'views.PaymentRequest.payInvoice'
-                                )}
-                                icon={
-                                    lightningReadyToSend
-                                        ? {
-                                              name: 'send',
-                                              size: 25
-                                          }
-                                        : undefined
-                                }
-                                onPress={() => {
-                                    if (isZaplocker)
-                                        LnurlPayStore.broadcastAttestation();
-                                    this.sendPayment({
-                                        payment_request: paymentRequest,
-                                        amount: satAmount
-                                            ? satAmount.toString()
-                                            : undefined,
-                                        max_parts: enableMultiPathPayment
-                                            ? maxParts
-                                            : null,
-                                        max_shard_amt: enableMultiPathPayment
-                                            ? maxShardAmt
-                                            : null,
-                                        fee_limit_sat: isLnd
-                                            ? feeLimitSat
-                                            : null,
-                                        max_fee_percent: isCLightning
-                                            ? maxFeePercentFormatted
-                                            : null,
-                                        outgoing_chan_id: outgoingChanId,
-                                        last_hop_pubkey: lastHopPubkey,
-                                        amp: enableAmp,
-                                        timeout_seconds: timeoutSeconds
-                                    });
-                                }}
-                                disabled={!lightningReadyToSend}
-                            />
+                {!!pay_req &&
+                    !loading &&
+                    BackendUtils.supportsLightningSends() && (
+                        <View style={{ bottom: 10 }}>
+                            <View style={styles.button}>
+                                <Button
+                                    title={localeString(
+                                        'views.PaymentRequest.payInvoice'
+                                    )}
+                                    icon={
+                                        lightningReadyToSend
+                                            ? {
+                                                  name: 'send',
+                                                  size: 25
+                                              }
+                                            : undefined
+                                    }
+                                    onPress={() => {
+                                        if (isZaplocker)
+                                            LnurlPayStore.broadcastAttestation();
+                                        this.sendPayment({
+                                            payment_request: paymentRequest,
+                                            amount: satAmount
+                                                ? satAmount.toString()
+                                                : undefined,
+                                            max_parts: enableMultiPathPayment
+                                                ? maxParts
+                                                : null,
+                                            max_shard_amt:
+                                                enableMultiPathPayment
+                                                    ? maxShardAmt
+                                                    : null,
+                                            fee_limit_sat: isLnd
+                                                ? feeLimitSat
+                                                : null,
+                                            max_fee_percent: isCLightning
+                                                ? maxFeePercentFormatted
+                                                : null,
+                                            outgoing_chan_id: outgoingChanId,
+                                            last_hop_pubkey: lastHopPubkey,
+                                            amp: enableAmp,
+                                            timeout_seconds: timeoutSeconds
+                                        });
+                                    }}
+                                    disabled={!lightningReadyToSend}
+                                />
+                            </View>
                         </View>
-                    </View>
-                )}
+                    )}
             </Screen>
         );
     }

diff --git a/views/Receive.tsx b/views/Receive.tsx
@@ -1285,9 +1285,8 @@ export default class Receive extends React.Component<
                         posStatus === 'active' ? null : haveInvoice ? (
                             <ClearButton />
                         ) : (
-                            BackendUtils.supportsAddressTypeSelection() && (
-                                <SettingsButton />
-                            )
+                            BackendUtils.supportsAddressTypeSelection() &&
+                            !creatingInvoice && <SettingsButton />
                         )
                     }
                     navigation={navigation}