mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2024-11-19 18:00:17 +01:00
Merge branch 'master' into ref
This commit is contained in:
commit
9b9b7f769f
@ -60,6 +60,7 @@ export type SendDetailsStackParamList = {
|
|||||||
Success: {
|
Success: {
|
||||||
fee: number;
|
fee: number;
|
||||||
amount: number;
|
amount: number;
|
||||||
|
txid?: string;
|
||||||
};
|
};
|
||||||
SelectWallet: {
|
SelectWallet: {
|
||||||
onWalletSelect: (wallet: TWallet) => void;
|
onWalletSelect: (wallet: TWallet) => void;
|
||||||
|
@ -211,6 +211,7 @@ const Confirm: React.FC = () => {
|
|||||||
navigate('Success', {
|
navigate('Success', {
|
||||||
fee: Number(fee),
|
fee: Number(fee),
|
||||||
amount,
|
amount,
|
||||||
|
txid,
|
||||||
});
|
});
|
||||||
|
|
||||||
dispatch({ type: ActionType.SET_LOADING, payload: false });
|
dispatch({ type: ActionType.SET_LOADING, payload: false });
|
||||||
|
@ -12,6 +12,7 @@ import SafeArea from '../../components/SafeArea';
|
|||||||
import { useTheme } from '../../components/themes';
|
import { useTheme } from '../../components/themes';
|
||||||
import loc from '../../loc';
|
import loc from '../../loc';
|
||||||
import { BitcoinUnit } from '../../models/bitcoinUnits';
|
import { BitcoinUnit } from '../../models/bitcoinUnits';
|
||||||
|
import HandOffComponent from '../../components/HandOffComponent';
|
||||||
|
|
||||||
const Success = () => {
|
const Success = () => {
|
||||||
const pop = () => {
|
const pop = () => {
|
||||||
@ -19,7 +20,7 @@ const Success = () => {
|
|||||||
};
|
};
|
||||||
const { colors } = useTheme();
|
const { colors } = useTheme();
|
||||||
const { getParent } = useNavigation();
|
const { getParent } = useNavigation();
|
||||||
const { amount, fee, amountUnit = BitcoinUnit.BTC, invoiceDescription = '', onDonePressed = pop } = useRoute().params;
|
const { amount, fee, amountUnit = BitcoinUnit.BTC, invoiceDescription = '', onDonePressed = pop, txid } = useRoute().params;
|
||||||
const stylesHook = StyleSheet.create({
|
const stylesHook = StyleSheet.create({
|
||||||
root: {
|
root: {
|
||||||
backgroundColor: colors.elevated,
|
backgroundColor: colors.elevated,
|
||||||
@ -47,6 +48,13 @@ const Success = () => {
|
|||||||
<View style={styles.buttonContainer}>
|
<View style={styles.buttonContainer}>
|
||||||
<Button onPress={onDonePressed} title={loc.send.success_done} />
|
<Button onPress={onDonePressed} title={loc.send.success_done} />
|
||||||
</View>
|
</View>
|
||||||
|
{txid && (
|
||||||
|
<HandOffComponent
|
||||||
|
title={loc.transactions.details_title}
|
||||||
|
type={HandOffComponent.activityTypes.ViewInBlockExplorer}
|
||||||
|
url={`https://mempool.space/tx/${txid}`}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</SafeArea>
|
</SafeArea>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user