From 87888c388115d892ee2bce53ab51e8a5bd33185a Mon Sep 17 00:00:00 2001 From: minibits-cash Date: Sat, 31 Aug 2024 23:07:35 +0200 Subject: [PATCH] Important: fix to make failed hodl invoices clear from pending, fix contacts (#96) --- package.json | 2 +- src/screens/Contacts/PrivateContacts.tsx | 2 +- src/services/walletService.ts | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7c81ced3..d8c9cfec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minibits_wallet", - "version": "0.1.8-beta.59", + "version": "0.1.8-beta.60", "private": true, "scripts": { "android:clean": "cd android && ./gradlew clean", diff --git a/src/screens/Contacts/PrivateContacts.tsx b/src/screens/Contacts/PrivateContacts.tsx index 6dec7ef6..6784000d 100644 --- a/src/screens/Contacts/PrivateContacts.tsx +++ b/src/screens/Contacts/PrivateContacts.tsx @@ -343,7 +343,7 @@ export const PrivateContacts = observer(function (props: { value={newContactName} autoCapitalize="none" keyboardType="default" - maxLength={60} + maxLength={64} selectTextOnFocus={true} style={[ $contactInput, diff --git a/src/services/walletService.ts b/src/services/walletService.ts index 3def1de5..6b749eb6 100644 --- a/src/services/walletService.ts +++ b/src/services/walletService.ts @@ -451,7 +451,7 @@ const _handleSpentByMintTask = async function ( log.trace('[_handleSpentByMintTask]', 'Remaining pendingByMintSecrets', remainingSecrets) - if(pendingCount > 0 && remainingSecrets.length > 0) { + if(remainingSecrets.length > 0) { log.trace('[_handleSpentByMintTask]', 'Starting sweep of pendingByMintSecrets back to spendable wallet') @@ -462,9 +462,9 @@ const _handleSpentByMintTask = async function ( // only move if it is from current mint if(proofToMove && proofToMove.mintUrl === mintUrl) { - const stillPendingByMint = pendingProofs.find(p => p.secret === secret) + const isStillPendingByMint = pendingProofs.some(p => p.secret === secret) - if(!stillPendingByMint) { + if(!isStillPendingByMint) { // move to spendable if it is not pending by mint anymore proofsStore.removeFromPendingByMint(proofToMove as Proof) movedProofs.push(proofToMove) @@ -476,7 +476,7 @@ const _handleSpentByMintTask = async function ( movedToSpendableAmount = CashuUtils.getProofsAmount(movedProofs as Proof[]) if(movedProofs.length > 0) { - log.trace('[_handleSpentByMintTask]', 'Moving proofs from pending to spendable', movedProofs.length) + log.debug('[_handleSpentByMintTask]', 'Moving proofs from pendingByMint to spendable', movedProofs.length) // Update related transactions as reverted let relatedTransactionIds: number[] = []