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 && (
-
)}
- {(payment_error == 'FAILURE_REASON_NO_ROUTE' ||
- payment_error ==
- localeString(
- 'error.failureReasonNoRoute'
- )) && (
- <>
+ {(!!error || !!payment_error) &&
+ !LnurlPayStore.isZaplocker && (
+
+
- {localeString(
- 'views.SendingLightning.lowFeeLimitMessage'
- )}
+ {localeString('general.error')}
-
+ )}
+ {!!success &&
+ !error &&
+ !!payment_preimage &&
+ payment_hash === LnurlPayStore.paymentHash &&
+ LnurlPayStore.successAction && (
+
+
+
+ )}
+ {!!payment_preimage &&
+ !isIncomplete &&
+ !error &&
+ !payment_error && (
+
+ navigation.goBack()}
- buttonStyle={{
- backgroundColor: 'white',
- height: 40
- }}
- containerStyle={{
- width: '100%',
- margin: 10
- }}
+ headingCopied={`${localeString(
+ 'views.Payment.paymentPreimage'
+ )} ${localeString(
+ 'components.ExternalLinkModal.copied'
+ )}`}
+ theme="dark"
+ URL={payment_preimage}
/>
- >
+
)}
- {(payment_error == 'FAILURE_REASON_TIMEOUT' ||
- payment_error ==
- localeString(
- 'error.failureReasonTimeout'
- )) && (
+
+
+
+ {noteKey && !error && !payment_error && (
+
- }
-
+ {(!!error ||
+ !!payment_error ||
+ !!success ||
+ !!inTransit) && (
+
+ navigation.navigate('Wallet', {
+ refresh: true
+ })
+ }
+ buttonStyle={{ height: 40 }}
+ titleStyle={{
+ color: themeColor('background')
+ }}
+ containerStyle={{ width: '100%' }}
+ />
+ )}
+
+ >
)}
);
@@ -463,6 +470,7 @@ const styles = StyleSheet.create({
flex: 1
},
content: {
+ flex: 1,
alignItems: 'center',
justifyContent: 'space-evenly',
height: '100%'
@@ -470,6 +478,7 @@ const styles = StyleSheet.create({
buttons: {
width: '100%',
justifyContent: 'space-between',
- gap: 15
+ gap: 15,
+ bottom: 15
}
});
diff --git a/views/SendingOnChain.tsx b/views/SendingOnChain.tsx
index fc90b7597..a478b8698 100644
--- a/views/SendingOnChain.tsx
+++ b/views/SendingOnChain.tsx
@@ -81,91 +81,95 @@ export default class SendingOnChain extends React.Component<
)}
{!loading && (
-
- {publishSuccess && (
- <>
-
+
+
+ {publishSuccess && (
+ <>
+
+
+
+
+ {localeString(
+ 'views.SendingOnChain.success'
+ )}
+
+
+ >
+ )}
+ {(error || error_msg) && (
-
-
- {localeString(
- 'views.SendingOnChain.success'
- )}
-
-
- >
- )}
- {(error || error_msg) && (
-
-
-
- {localeString('general.error')}
-
- {error_msg && (
+
- {error_msg}
+ {localeString('general.error')}
- )}
-
- )}
- {txid && (
-
-
+ {error_msg}
+
)}
- headingCopied={`${localeString(
- 'views.SendingOnChain.txid'
- )} ${localeString(
- 'components.ExternalLinkModal.copied'
- )}`}
- URL={txid}
- theme="dark"
- />
-
- )}
+
+ )}
+ {txid && (
+
+
+
+ )}
+
{txid && (
@@ -261,6 +265,7 @@ const styles = StyleSheet.create({
flex: 1
},
content: {
+ flex: 1,
alignItems: 'center',
justifyContent: 'space-evenly',
height: '100%'
@@ -268,6 +273,7 @@ const styles = StyleSheet.create({
buttons: {
justifyContent: 'flex-end',
width: '100%',
- gap: 15
+ gap: 15,
+ bottom: 15
}
});