From a39f1e241178b861bf4ff3859bfd217c02a4d8cd Mon Sep 17 00:00:00 2001 From: minibits-cash Date: Sat, 8 Feb 2025 23:51:56 +0100 Subject: [PATCH] Fix donation navigation --- android/app/build.gradle | 2 +- src/screens/Contacts/OwnName.tsx | 25 ++++++++++++++----------- src/screens/TransferScreen.tsx | 6 +++++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d5cb5ec1..bdfb3a9b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -95,7 +95,7 @@ android { applicationId "com.minibits_wallet" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 58026 + versionCode 58027 versionName "0.2.0" } diff --git a/src/screens/Contacts/OwnName.tsx b/src/screens/Contacts/OwnName.tsx index 5599d843..cd512b91 100644 --- a/src/screens/Contacts/OwnName.tsx +++ b/src/screens/Contacts/OwnName.tsx @@ -22,7 +22,7 @@ import { roundUp } from '../../utils/number' import { LNURLPayParams, LnurlClient } from '../../services/lnurlService' import { useNavigation } from '@react-navigation/native' -const DEFAULT_DONATION_AMOUNT = 500 +const DEFAULT_DONATION_AMOUNT = 10 const DONATION_LNURL_ADDRESS = 'minibits@minibits.cash' export const OwnName = observer(function (props: {pubkey: string}) { @@ -191,16 +191,19 @@ export const OwnName = observer(function (props: {pubkey: string}) { if(selectedBalance && selectedBalance.balances['sat']! + feeReserve >= donationAmount) { const addressParamsResult = await LnurlClient.getLnurlAddressParams(DONATION_LNURL_ADDRESS) // throws - - return navigation.navigate('Transfer', { - lnurlParams: addressParamsResult.lnurlParams as LNURLPayParams, - paymentOption: SendOption.LNURL_PAY, - fixedAmount: donationAmount, - unit: 'sat', - comment, - mintUrl: selectedBalance.mintUrl, - isDonation: true, - donationForName: ownName + //@ts-ignore + return navigation.navigate('WalletNavigator', { + screen: 'Transfer', + params: { + lnurlParams: addressParamsResult.lnurlParams as LNURLPayParams, + paymentOption: SendOption.LNURL_PAY, + fixedAmount: donationAmount, + unit: 'sat', + comment, + mintUrl: selectedBalance.mintUrl, + isDonation: true, + donationForName: ownName + } }) } else { const invoice = await MinibitsClient.createDonation( diff --git a/src/screens/TransferScreen.tsx b/src/screens/TransferScreen.tsx index cc23ce39..b03a5a4b 100644 --- a/src/screens/TransferScreen.tsx +++ b/src/screens/TransferScreen.tsx @@ -453,10 +453,14 @@ useEffect(() => { const gotoContacts = function () { + resetState() + navigation.dispatch( + StackActions.popToTop() + ) //@ts-ignore navigation.navigate('ContactsNavigator', { screen: 'Contacts', - params: {paymentOption: SendOption.SEND_TOKEN} + params: {} }) }