Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed scan QR #130

Merged
merged 2 commits into from
Oct 7, 2022
+9 −4
Merged

fixed scan QR #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d16ea9
fixed scan QR
kcw-grunt Oct 7, 2022
21afe6a
update gitignore
kcw-grunt Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Packages/
Package.pins
Package.resolved
.build/
/*.xcodeproj

# Add this line if you want to avoid checking in Xcode SPM integration.
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
Expand Down
6 changes: 3 additions & 3 deletions loafwallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 321;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ZV7987N2ZC;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down Expand Up @@ -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 = 321;
DEVELOPMENT_TEAM = ZV7987N2ZC;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -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 = 321;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ZV7987N2ZC;
FRAMEWORK_SEARCH_PATHS = (
Expand Down
6 changes: 6 additions & 0 deletions loafwallet/src/ViewControllers/RootModals/SendViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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)
Expand Down