Merge pull request #1518 from p2p-org/feature/pwn-9438

[PWN-9438] feat: Send as SendViaLink
p2p-org · Jul 31, 2023 · 8ca4a15 · 8ca4a15
2 parents 0175ca8 + 383cd3b
commit 8ca4a15
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/Packages/KeyAppKit/Sources/Send/Input/SendInputBusinessLogic+ChangeToken.swift b/Packages/KeyAppKit/Sources/Send/Input/SendInputBusinessLogic+ChangeToken.swift
@@ -1,7 +1,3 @@
-// Copyright 2022 P2P Validator Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style license that can be
-// found in the LICENSE file.
-
 import FeeRelayerSwift
 import Foundation
 import KeyAppKitCore

diff --git a/Packages/KeyAppKit/Sources/Send/Input/Services/SendFeeCalculator.swift b/Packages/KeyAppKit/Sources/Send/Input/Services/SendFeeCalculator.swift
@@ -74,6 +74,11 @@ public class SendFeeCalculatorImpl: SendFeeCalculator {
             accountBalances: isAssociatedTokenUnregister ? context.minimumTokenAccountBalance : 0
         )
 
+        // TODO: - Remove later: Send as SendViaLink when link creation available
+        if !context.usageStatus.reachedLimitLinkCreation {
+            return .zero
+        }
+
         // when free transaction is not available and user is paying with sol, let him do this the normal way (don't use
         // fee relayer)
         if isFreeTransactionNotAvailableAndUserIsPayingWithSOL(context, payingTokenMint: payingTokenMint) {

diff --git a/p2p_wallet/Scenes/Main/Send/Input/SendInputViewModel.swift b/p2p_wallet/Scenes/Main/Send/Input/SendInputViewModel.swift
@@ -582,6 +582,8 @@ private extension SendInputViewModel {
                 isFakeSendTransaction: isFakeSendTransaction,
                 isFakeSendTransactionError: isFakeSendTransactionError,
                 isFakeSendTransactionNetworkError: isFakeSendTransactionNetworkError,
+                isLinkCreationAvailable: stateMachine.currentState.feeRelayerContext?.usageStatus
+                    .reachedLimitLinkCreation == false,
                 recipient: recipient,
                 sendViaLinkSeed: sendViaLinkSeed,
                 amount: amountInToken,

diff --git a/p2p_wallet/Scenes/Main/Send/Models/SendTransaction.swift b/p2p_wallet/Scenes/Main/Send/Models/SendTransaction.swift
@@ -12,6 +12,7 @@ struct SendTransaction: RawTransactionType {
     let isFakeSendTransaction: Bool
     let isFakeSendTransactionError: Bool
     let isFakeSendTransactionNetworkError: Bool
+    let isLinkCreationAvailable: Bool
     let recipient: Recipient
     let sendViaLinkSeed: String?
     let amount: Double
@@ -84,7 +85,7 @@ struct SendTransaction: RawTransactionType {
                 receiver: address,
                 amount: amount,
                 feeWallet: payingFeeWallet,
-                ignoreTopUp: isSendingViaLink,
+                ignoreTopUp: isSendingViaLink || isLinkCreationAvailable,
                 memo: isSendingViaLink ? .secretConfig("SEND_VIA_LINK_MEMO_PREFIX")! + "-send" : nil,
                 operationType: isSendingViaLink ? .sendViaLink : .transfer
             )

diff --git a/p2p_wallet/Scenes/Main/Send/TransactionStatus/SendTransactionStatusView.swift b/p2p_wallet/Scenes/Main/Send/TransactionStatus/SendTransactionStatusView.swift
@@ -206,6 +206,7 @@ struct SendTransactionStatusView_Previews: PreviewProvider {
                     isFakeSendTransaction: false,
                     isFakeSendTransactionError: false,
                     isFakeSendTransactionNetworkError: false,
+                    isLinkCreationAvailable: true,
                     recipient: .init(address: "", category: .solanaAddress, attributes: .funds),
                     sendViaLinkSeed: nil,
                     amount: 0.01,