diff --git a/views/SendingLightning.tsx b/views/SendingLightning.tsx index 2ddab307d..37f65539d 100644 --- a/views/SendingLightning.tsx +++ b/views/SendingLightning.tsx @@ -154,125 +154,92 @@ export default class SendingLightning extends React.Component< )} {!loading && ( - - {(!!success || !!inTransit) && !error && ( - - )} - {!!success && !error && ( - <> - - - + <> + + {(!!success || !!inTransit) && !error && ( + + )} + {!!success && !error && ( + <> + + + + + {localeString( + 'views.SendingLightning.success' + )} + + + + )} + {!!inTransit && !error && ( + + {localeString( - 'views.SendingLightning.success' + 'views.SendingLightning.inTransit' )} - - )} - {!!inTransit && !error && ( - - - - {localeString( - 'views.SendingLightning.inTransit' - )} - - - )} - {LnurlPayStore.isZaplocker && (!success || !!error) && ( - - - - {localeString( - 'views.SendingLightning.isZaplocker' - )} - - - )} - {(!!error || !!payment_error) && - !LnurlPayStore.isZaplocker && ( - - - - {localeString('general.error')} - - {(payment_error || error_msg) && ( + - {payment_error || error_msg} + {localeString( + 'views.SendingLightning.isZaplocker' + )} - )} - - )} - {!!success && - !error && - !!payment_preimage && - payment_hash === LnurlPayStore.paymentHash && - LnurlPayStore.successAction && ( - - - - )} - {!!payment_preimage && - !isIncomplete && - !error && - !payment_error && ( - - - - )} - { - - {noteKey && !error && !payment_error && ( -