From 1d16ea9d98898d4a8b48bbf053fe1ceddc269561 Mon Sep 17 00:00:00 2001 From: kcw-grunt Date: Fri, 7 Oct 2022 23:03:41 +0100 Subject: [PATCH] fixed scan QR --- loafwallet.xcodeproj/project.pbxproj | 6 +++--- .../src/ViewControllers/RootModals/SendViewController.swift | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/loafwallet.xcodeproj/project.pbxproj b/loafwallet.xcodeproj/project.pbxproj index 6cd6bd015..596ecb75d 100644 --- a/loafwallet.xcodeproj/project.pbxproj +++ b/loafwallet.xcodeproj/project.pbxproj @@ -4815,7 +4815,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements; - CURRENT_PROJECT_VERSION = 304; + CURRENT_PROJECT_VERSION = 304; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZV7987N2ZC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -5235,7 +5235,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements; - CURRENT_PROJECT_VERSION = 304; + CURRENT_PROJECT_VERSION = 304; DEVELOPMENT_TEAM = ZV7987N2ZC; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( @@ -5367,7 +5367,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements; - CURRENT_PROJECT_VERSION = 304; + CURRENT_PROJECT_VERSION = 304; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZV7987N2ZC; FRAMEWORK_SEARCH_PATHS = ( diff --git a/loafwallet/src/ViewControllers/RootModals/SendViewController.swift b/loafwallet/src/ViewControllers/RootModals/SendViewController.swift index 9d8f36c3c..58504d988 100644 --- a/loafwallet/src/ViewControllers/RootModals/SendViewController.swift +++ b/loafwallet/src/ViewControllers/RootModals/SendViewController.swift @@ -261,8 +261,13 @@ class SendViewController : UIViewController, Subscriber, ModalPresentable, Track @objc private func scanTapped() { descriptionCell.textView.resignFirstResponder() + presentScan? { [weak self] paymentRequest in + guard let request = paymentRequest else { return } + guard let destinationAddress = paymentRequest?.toAddress else { return } + + self?.sendAddressCell.rootView.viewModel.addressString = destinationAddress self?.handleRequest(request) } } @@ -332,6 +337,7 @@ class SendViewController : UIViewController, Subscriber, ModalPresentable, Track if request.label != nil { descriptionCell.content = request.label } + case .remote: let loadingView = BRActivityViewController(message: S.Send.loadingRequest) present(loadingView, animated: true, completion: nil)