PERA-1334 :: fix coinbase asset transfer via qr issue (#97)

perawallet · Jan 2, 2025 · 808bdfb · 808bdfb
1 parent f6d56f6
commit 808bdfb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/app/src/main/java/com/algorand/android/usecase/AssetTransferAmountPreviewUseCase.kt b/app/src/main/java/com/algorand/android/usecase/AssetTransferAmountPreviewUseCase.kt
@@ -54,9 +54,8 @@ class AssetTransferAmountPreviewUseCase @Inject constructor(
         assetTransaction: AssetTransaction
     ): TransactionData.Send? {
         val senderAccountDetail = accountDetailUseCase.getCachedAccountDetail(accountAddress)?.data ?: return null
-        val receiverAccountDetail = accountDetailUseCase.getCachedAccountDetail(
-            assetTransaction.receiverUser?.publicKey.orEmpty()
-        )?.data ?: return null
+        val receiverAccountInfo = accountDetailUseCase.getCachedAccountDetail(accountAddress)?.data?.accountInformation
+
         return TransactionData.Send(
             senderAccountAddress = senderAccountDetail.account.address,
             senderAccountDetail = senderAccountDetail.account.detail,
@@ -74,7 +73,7 @@ class AssetTransferAmountPreviewUseCase @Inject constructor(
                 publicKey = assetTransaction.receiverUser?.publicKey.orEmpty(),
                 accountIconDrawablePreview = createAccountIconDrawableUseCase.invoke(accountAddress)
             ),
-            isArc59Transaction = !receiverAccountDetail.accountInformation.hasAsset(selectedAsset.assetId)
+            isArc59Transaction = receiverAccountInfo?.hasAsset(selectedAsset.assetId)?.not() ?: false
         )
     }
 

diff --git a/app/src/main/java/com/algorand/android/usecase/SenderAccountSelectionPreviewUseCase.kt b/app/src/main/java/com/algorand/android/usecase/SenderAccountSelectionPreviewUseCase.kt
@@ -44,7 +44,7 @@ class SenderAccountSelectionPreviewUseCase @Inject constructor(
         assetTransaction: AssetTransaction
     ): TransactionData.Send? {
         val senderAccountDetail = accountDetailUseCase.getCachedAccountDetail(accountAddress)?.data ?: return null
-        val receiverAccountDetail = accountDetailUseCase.getCachedAccountDetail(accountAddress)?.data ?: return null
+        val receiverAccountInfo = accountDetailUseCase.getCachedAccountDetail(accountAddress)?.data?.accountInformation
         return TransactionData.Send(
             senderAccountAddress = senderAccountDetail.account.address,
             senderAccountDetail = senderAccountDetail.account.detail,
@@ -62,7 +62,7 @@ class SenderAccountSelectionPreviewUseCase @Inject constructor(
                 publicKey = assetTransaction.receiverUser?.publicKey.orEmpty(),
                 accountIconDrawablePreview = createAccountIconDrawableUseCase.invoke(accountAddress)
             ),
-            isArc59Transaction = !receiverAccountDetail.accountInformation.hasAsset(selectedAsset.assetId)
+            isArc59Transaction = receiverAccountInfo?.hasAsset(selectedAsset.assetId)?.not() ?: false
         )
     }