Merge pull request #1184 from tari-project/feature/remove_confirm_tra…

…nsaction Remove confirmation for TTL store funds transfer
tari-project · Dec 3, 2024 · 293fc82 · 293fc82
2 parents e13ffac + 3cc5a5b
commit 293fc82
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/MobileWallet.xcodeproj/project.pbxproj b/MobileWallet.xcodeproj/project.pbxproj
@@ -4129,7 +4129,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 0.29.0;
+				MARKETING_VERSION = 0.30.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tari.wallet;
 				PRODUCT_NAME = "Tari Aurora";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4162,7 +4162,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 0.29.0;
+				MARKETING_VERSION = 0.30.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tari.wallet;
 				PRODUCT_NAME = "Tari Aurora";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/MobileWallet/Screens/Send/AddAmount/AddAmountViewController.swift b/MobileWallet/Screens/Send/AddAmount/AddAmountViewController.swift
@@ -442,8 +442,14 @@ final class AddAmountViewController: DynamicThemeViewController {
 
     @objc private func continueButtonTapped() {
         guard let paymentInfo = updatedPaymentInfo() else { return }
-        let controller = AddNoteViewController(paymentInfo: paymentInfo, isOneSidedPayment: oneSidedPaymentSwitch.isOn)
-        navigationController?.pushViewController(controller, animated: true)
+
+        if paymentInfo.note != nil {
+            let paymentInfo = PaymentInfo(addressComponents: paymentInfo.addressComponents, alias: paymentInfo.alias, yatID: paymentInfo.yatID, amount: paymentInfo.amount, feePerGram: paymentInfo.feePerGram, note: paymentInfo.note)
+            TransactionProgressPresenter.showTransactionProgress(presenter: self, paymentInfo: paymentInfo, isOneSidedPayment: oneSidedPaymentSwitch.isOn)
+        }else {
+            let controller = AddNoteViewController(paymentInfo: paymentInfo, isOneSidedPayment: oneSidedPaymentSwitch.isOn)
+            navigationController?.pushViewController(controller, animated: true)
+        }
     }
 
     private func calculateAmount() -> MicroTari? {
@@ -542,7 +548,11 @@ extension AddAmountViewController {
         continueButtonSecondConstraint.priority = UILayoutPriority(rawValue: 1000)
         continueButtonSecondConstraint.isActive = true
 
-        continueButton.setTitle(localized("common.continue"), for: .normal)
+        if paymentInfo.note != nil {
+            continueButton.setTitle(localized("common.send.with_param", arguments: NetworkManager.shared.selectedNetwork.tickerSymbol), for: .normal)
+        }else {
+            continueButton.setTitle(localized("common.continue"), for: .normal)
+        }
         continueButton.addTarget(self, action: #selector(continueButtonTapped), for: .touchUpInside)
         continueButton.isEnabled = false
         setupKeypad()

diff --git a/dependencies.env b/dependencies.env
@@ -1 +1 @@
-FFI_VERSION="1.8.0-rc.0"
+FFI_VERSION="1.9.1-rc.0"