bugfix: only attempt to create a token account on send if the error i…

…s UnknownAccountInRequest. Also don't attempt to merge accounts if we don't have token accounts to merge. GitOrigin-RevId: c0bc101e7bed7113042c84bcc888079f46c18282
kinecosystem · May 27, 2021 · 33be8e2 · 33be8e2
1 parent 11c7b1d
commit 33be8e2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/base/src/main/java/org/kin/sdk/base/KinAccountContext.kt b/base/src/main/java/org/kin/sdk/base/KinAccountContext.kt
@@ -454,7 +454,7 @@ class KinAccountContextImpl private constructor(
     private fun mergeTokenAccountsIfNecessary(): Promise<List<KinTokenAccountInfo>> {
         val account = storage.getAccount(accountId)
         val privateKey = account?.key as? Key.PrivateKey
-        return if (privateKey != null && account.status is KinAccount.Status.Registered) {
+        return if (privateKey != null && account.status is KinAccount.Status.Registered && account.tokenAccounts.size > 1) {
             service.mergeTokenAccounts(
                 accountId,
                 privateKey,
@@ -464,7 +464,6 @@ class KinAccountContextImpl private constructor(
                     .map { tokenAccountInfos }
             }
         } else Promise.of(emptyList<KinTokenAccountInfo>())
-
     }
 
     override fun getAccount(forceUpdate: Boolean): Promise<KinAccount> {
@@ -645,7 +644,7 @@ class KinAccountContextImpl private constructor(
                         *payments.map { paymentItem ->
                             service.resolveTokenAccounts(paymentItem.destinationAccount)
                                 .flatMap {
-                                    if (it.isEmpty()) {
+                                    if (it.isEmpty() && error == KinService.FatalError.UnknownAccountInRequest) {
                                         service.createTokenAccountForDestinationOwner(paymentItem.destinationAccount.toProtoSolanaAccountId().toPublicKey())
                                             .map { (destAccountInstructions, signer) ->
                                                 createAccountInstructions += destAccountInstructions