feat(flipcash): add confirmation for user to handle their own cash collection in app

bmc08gt · bmc08gt · commit dbf9dca36623 · 2025-06-05T14:22:03.000-04:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/bill/BillController.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/bill/BillController.kt
@@ -60,7 +60,8 @@ class BillController @Inject constructor(
     fun receiveGiftCard(
         entropy: String,
         owner: AccountCluster,
+        claimIfOwned: Boolean,
         onReceived: (LocalFiat) -> Unit,
         onError: (Throwable) -> Unit,
-    ) = transactionManager.receiveGiftCard(owner, entropy, onReceived, onError)
+    ) = transactionManager.receiveGiftCard(owner, entropy, claimIfOwned, onReceived, onError)
 }
diff --git a/apps/flipcash/core/src/main/res/values/strings.xml b/apps/flipcash/core/src/main/res/values/strings.xml
@@ -159,4 +159,9 @@
 
     <string name="error_title_failedToOpenExternalLink">Something Went Wrong</string>
     <string name="error_description_failedToOpenExternalLink">We were unable to open the link on this device. Please try again later</string>
+
+    <string name="prompt_title_collectOwnCash">Collect Your Own Cash?</string>
+    <string name="prompt_description_collectOwnCash">You tapped to collect the cash you sent. Are you sure you want to collect it yourself?</string>
+    <string name="action_dontCollect">Don\'t Collect</string>
+    <string name="action_collect">Collect</string>
 </resources>
diff --git a/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt b/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt
@@ -28,6 +28,7 @@ import com.flipcash.core.R
 import com.flipcash.services.billing.BillingClient
 import com.flipcash.services.controllers.AccountController
 import com.flipcash.services.user.UserManager
+import com.getcode.manager.BottomBarAction
 import com.getcode.manager.BottomBarManager
 import com.getcode.opencode.controllers.BalanceController
 import com.getcode.opencode.controllers.TransactionController
@@ -522,10 +523,18 @@ class RealSessionController @Inject constructor(
         }
 
         // TODO: analytics
+        claimGiftCard(owner = owner, entropy = entropy, claimIfOwned = false)
+    }
 
+    private fun claimGiftCard(
+        owner: AccountCluster,
+        entropy: String,
+        claimIfOwned: Boolean
+    ) {
         billController.receiveGiftCard(
             entropy = entropy,
             owner = owner,
+            claimIfOwned = claimIfOwned,
             onReceived = {
                 toastController.enqueue(it, isDeposit = true)
                 showBill(
@@ -537,6 +546,36 @@ class RealSessionController @Inject constructor(
             },
             onError = { cause ->
                 when (cause) {
+                    is ReceiveGiftTransactorError.UsersGiftCard -> {
+                        // present confirmation to claim (cancel) own gift card
+                        BottomBarManager.showMessage(
+                            title = resources.getString(R.string.prompt_title_collectOwnCash),
+                            subtitle = resources.getString(R.string.prompt_description_collectOwnCash),
+                            isDismissible = false,
+                            actions = buildList {
+                                add(
+                                    BottomBarAction(
+                                        text = resources.getString(R.string.action_dontCollect),
+                                    )
+                                )
+
+                                add(
+                                    BottomBarAction(
+                                        text = resources.getString(R.string.action_collect),
+                                        style = BottomBarManager.BottomBarButtonStyle.Text,
+                                        onClick = {
+                                            claimGiftCard(
+                                                owner = owner,
+                                                entropy = entropy,
+                                                // confirmed claim of own cash link
+                                                claimIfOwned = true
+                                            )
+                                        }
+                                    )
+                                )
+                            }
+                        )
+                    }
                     is ReceiveGiftTransactorError.AlreadyClaimed -> {
                         BottomBarManager.showError(
                             resources.getString(R.string.error_title_alreadyCollected),
diff --git a/libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt b/libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt
@@ -88,6 +88,32 @@ object BottomBarManager {
         }
     }
 
+    fun showMessage(
+        title: String,
+        subtitle: String,
+        actions: List<BottomBarAction>,
+        showCancel: Boolean = false,
+        isDismissible: Boolean = true,
+        showScrim: Boolean = false,
+        type: BottomBarMessageType = BottomBarMessageType.DESTRUCTIVE,
+        timeoutSeconds: Int? = null,
+        onClose: (SelectedBottomBarAction) -> Unit = { }
+    ) {
+        showMessage(
+            BottomBarMessage(
+                title = title,
+                subtitle = subtitle,
+                showCancel = showCancel,
+                type = type,
+                actions = actions,
+                isDismissible = isDismissible,
+                showScrim = showScrim,
+                onClose = onClose,
+                timeoutSeconds = timeoutSeconds,
+            )
+        )
+    }
+
     /**
      * This replaces the error messaging from [TopBarManager] into a simpler, easy-to-reach
      * bottom anchored error message.
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/AccountController.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/AccountController.kt
@@ -3,6 +3,7 @@ package com.getcode.opencode.controllers
 import com.getcode.opencode.internal.network.api.intents.IntentCreateAccount
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.model.accounts.AccountInfo
+import com.getcode.opencode.model.accounts.GiftCardAccount
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.repositories.AccountRepository
 import com.getcode.solana.keys.PublicKey
@@ -26,7 +27,13 @@ class AccountController @Inject constructor(
             .map { it.id.bytes }
     }
 
-    suspend fun getAccounts(owner: AccountCluster): Result<Map<PublicKey, AccountInfo>> {
-        return accountRepository.getAccounts(owner.authority.keyPair)
+    suspend fun getAccounts(
+        accountOwner: AccountCluster,
+        requestingOwner: AccountCluster
+    ): Result<Map<PublicKey, AccountInfo>> {
+        return accountRepository.getAccounts(
+            accountOwner = accountOwner.authority.keyPair,
+            requestingOwner = requestingOwner.authority.keyPair
+        )
     }
 }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/BalanceController.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/BalanceController.kt
@@ -137,13 +137,13 @@ class BalanceController @Inject constructor(
 
             retryable(
                 maxRetries = 3,
-                call = suspend { accountController.getAccounts(owner) }
+                call = suspend { accountController.getAccounts(owner, owner) }
             )?.recoverCatching { error ->
                 if (error is GetAccountsError.NotFound) {
                     // No account yet, let's create it
                     val createResult = accountController.createUserAccount(owner)
                     if (createResult.isSuccess) {
-                        accountController.getAccounts(owner)
+                        accountController.getAccounts(owner, owner)
                             .getOrElse { throw it }
                     } else {
                         throw createResult.exceptionOrNull() ?: Exception("Account creation failed")
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalAccountRepository.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalAccountRepository.kt
@@ -15,6 +15,7 @@ internal class InternalAccountRepository @Inject constructor(
     ): Result<Boolean> = service.isCodeAccount(owner)
 
     override suspend fun getAccounts(
-        owner: Ed25519.KeyPair
-    ): Result<Map<PublicKey, AccountInfo>> = service.getAccounts(owner)
+        accountOwner: Ed25519.KeyPair,
+        requestingOwner: Ed25519.KeyPair,
+    ): Result<Map<PublicKey, AccountInfo>> = service.getAccounts(accountOwner, requestingOwner)
 }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/AccountApi.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/AccountApi.kt
@@ -44,17 +44,28 @@ internal class AccountApi @Inject constructor(
      * Returns token account metadata relevant to the Code owner
      * account.
      *
-     * @param owner The owner account, which can also be thought of as a parent account for this
-     *   RPC that links to one or more token accounts.
+     * @param accountOwner The owner account to fetch balances for, which can also be thought of as a
+     *   parent account for this RPC that links to one or more token accounts.
+     * @param requestingOwner A requesting owner account that is requesting the balance for owner. Additional
+     *   metadata that is considered private will be provided, if applicable. An example
+     *   use case includes a user owner account requesting account info for a gift card
+     *   owner account.
      *
-     * @return The [AccountService.GetTokenAccountInfosResponse]
+     * @return The [AccountService.GetTokenAccountInfosResponse] for the owner account.
      */
     suspend fun getTokenAccounts(
-        owner: KeyPair
+        accountOwner: KeyPair,
+        requestingOwner: KeyPair,
     ): AccountService.GetTokenAccountInfosResponse {
         val request = AccountService.GetTokenAccountInfosRequest.newBuilder()
-            .setOwner(owner.asSolanaAccountId())
-            .apply { setSignature(sign(owner)) }
+            .setOwner(accountOwner.asSolanaAccountId())
+            .setRequestingOwner(requestingOwner.asSolanaAccountId())
+            .apply {
+                val ownerSig = sign(accountOwner)
+                val requestingOwnerSig = sign(requestingOwner)
+                setSignature(ownerSig)
+                setRequestingOwnerSignature(requestingOwnerSig)
+            }
             .build()
 
         return withContext(Dispatchers.IO) {
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/services/AccountService.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/services/AccountService.kt
@@ -36,10 +36,11 @@ internal class AccountService @Inject constructor(
     }
 
     suspend fun getAccounts(
-        owner: KeyPair
+        accountOwner: KeyPair,
+        requestingOwner: KeyPair,
     ): Result<Map<PublicKey, AccountInfo>> {
         return runCatching {
-            api.getTokenAccounts(owner)
+            api.getTokenAccounts(accountOwner, requestingOwner)
         }.fold(
             onSuccess = { response ->
                 when (response.result) {
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/ReceiveGiftCardTransactor.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/ReceiveGiftCardTransactor.kt
@@ -29,7 +29,7 @@ internal class ReceiveGiftCardTransactor(
         giftCardAccount = giftCardManager.createGiftCard(mnemonic)
     }
 
-    suspend fun start(): Result<LocalFiat> {
+    suspend fun start(claimIfOwned: Boolean): Result<LocalFiat> {
         val ownerKey = owner ?: return logAndFail(ReceiveGiftTransactorError.Other(message = "No owner key. Did you call with() first?"))
         val giftCard = giftCardAccount ?: return logAndFail(
             ReceiveGiftTransactorError.Other(
@@ -39,8 +39,10 @@ internal class ReceiveGiftCardTransactor(
 
         // before we can receive the gift card
         // we need to determine the balance of it
-        val accounts = accountController.getAccounts(giftCard.cluster)
-            .getOrElse { return logAndFail(ReceiveGiftTransactorError.FailedToQuery()) }
+        val accounts = accountController.getAccounts(
+            accountOwner = giftCard.cluster,
+            requestingOwner = ownerKey
+        ).getOrElse { return logAndFail(ReceiveGiftTransactorError.FailedToQuery()) }
             .takeIf { it.isNotEmpty() }
             ?: return logAndFail(ReceiveGiftTransactorError.FailedToQuery())
 
@@ -54,6 +56,10 @@ internal class ReceiveGiftCardTransactor(
             return logAndFail(ReceiveGiftTransactorError.Expired())
         }
 
+        if (info.isGiftCardIssuer && !claimIfOwned) {
+            return Result.failure(ReceiveGiftTransactorError.UsersGiftCard())
+        }
+
         val exchangeData = info.originalExchangeData
         val amount = LocalFiat(exchangeData)
 
@@ -84,6 +90,7 @@ sealed class ReceiveGiftTransactorError(
 ) : CodeServerError(message, cause) {
     class FailedToQuery: GrabTransactorError(message = "Failed to query account")
     class AlreadyClaimed: GrabTransactorError(message = "Already claimed")
+    class UsersGiftCard: GrabTransactorError(message = "User is gift card issuer")
     class Expired: GrabTransactorError(message = "Expired")
 
     data class Other(
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/managers/BillTransactionManager.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/managers/BillTransactionManager.kt
@@ -161,6 +161,7 @@ class BillTransactionManager @Inject constructor(
     fun receiveGiftCard(
         owner: AccountCluster,
         entropy: String,
+        claimIfOwned: Boolean,
         onReceived: (LocalFiat) -> Unit,
         onError: (Throwable) -> Unit,
     ) {
@@ -178,7 +179,7 @@ class BillTransactionManager @Inject constructor(
 
             receiveTransactor = transactor
 
-            receiveTransactor?.start()
+            receiveTransactor?.start(claimIfOwned)
                 ?.onSuccess { amount ->
                     onReceived(amount)
                     balanceController.add(amount)
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/accounts/AccountInfo.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/accounts/AccountInfo.kt
@@ -90,7 +90,12 @@ data class AccountInfo(
      */
     val createdAt: Long?,
 
-    ) {
+    /**
+     * For REMOTE_SEND_GIFT_CARD, if requesting_owner was provided, was
+     * requesting_owner the issuer of the account.
+     */
+    val isGiftCardIssuer: Boolean
+) {
     companion object {
         fun newInstance(info: AccountService.TokenAccountInfo): AccountInfo? {
             val accountType =
@@ -120,7 +125,8 @@ data class AccountInfo(
                 claimState = claimState,
                 originalExchangeData = exchangeData,
                 mint = info.mint.toPublicKey(),
-                createdAt = info.createdAt.seconds * 1000L
+                createdAt = info.createdAt.seconds * 1000L,
+                isGiftCardIssuer = info.isGiftCardIssuer
             )
         }
     }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/repositories/AccountRepository.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/repositories/AccountRepository.kt
@@ -6,5 +6,5 @@ import com.getcode.solana.keys.PublicKey
 
 interface AccountRepository {
     suspend fun isCodeAccount(owner: KeyPair): Result<Boolean>
-    suspend fun getAccounts(owner: KeyPair): Result<Map<PublicKey, AccountInfo>>
+    suspend fun getAccounts(accountOwner: KeyPair, requestingOwner: KeyPair): Result<Map<PublicKey, AccountInfo>>
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ internal class InternalAccountRepository @Inject constructor(`
`15`	`15`	`): Result<Boolean> = service.isCodeAccount(owner)`
`16`	`16`
`17`	`17`	`override suspend fun getAccounts(`
`18`		`- owner: Ed25519.KeyPair`
`19`		`- ): Result<Map<PublicKey, AccountInfo>> = service.getAccounts(owner)`
	`18`	`+ accountOwner: Ed25519.KeyPair,`
	`19`	`+ requestingOwner: Ed25519.KeyPair,`
	`20`	`+ ): Result<Map<PublicKey, AccountInfo>> = service.getAccounts(accountOwner, requestingOwner)`
`20`	`21`	`}`