Merge pull request #54 from Montelibero/fix-claim-claimable

filter out claimClaimableBalance txs as well
Montelibero · Jun 3, 2024 · c5f2361 · c5f2361
2 parents fb098ac + efc8a7c
commit c5f2361
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "org.montelibero.solar",
   "displayName": "MTL Solar",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Wallet for the Stellar payment network by Montelibero.",
   "license": "MIT",
   "private": true,

diff --git a/src/Account/components/AccountTransactions.tsx b/src/Account/components/AccountTransactions.tsx
@@ -21,8 +21,10 @@ import { InteractiveSignatureRequestList } from "./SignatureRequestList"
 import TransactionList from "./TransactionList"
 import { isDustTransaction } from "~Generic/lib/transaction"
 
-const excludeClaimableFilter = (tx: DecodedTransactionResponse) =>
-  !tx.decodedTx.operations.every(o => o.type === "createClaimableBalance")
+const excludeClaimableFilter = (account: Account, tx: DecodedTransactionResponse) =>
+  !tx.decodedTx.operations.every(
+    o => o.type === "createClaimableBalance" || (o.type === "claimClaimableBalance" && o.source !== account.publicKey)
+  )
 
 const excludeDustFilter = (account: Account, tx: DecodedTransactionResponse) =>
   !isDustTransaction(tx.decodedTx, account)
@@ -82,7 +84,10 @@ function AccountTransactions(props: { account: Account }) {
   const txsFilter = React.useCallback(
     (txs: DecodedTransactionResponse[]) =>
       txs.filter(tx => {
-        return (showClaimableBalanceTxs || excludeClaimableFilter(tx)) && (showDust || excludeDustFilter(account, tx))
+        return (
+          (showClaimableBalanceTxs || excludeClaimableFilter(account, tx)) &&
+          (showDust || excludeDustFilter(account, tx))
+        )
       }),
     []
   )