Skip to content

Commit

Permalink
Merge pull request #480 from dashpay/develop
Browse files Browse the repository at this point in the history
chore: Merge develop into master
  • Loading branch information
tikhop authored Jan 12, 2023
2 parents 2df8cdb + 15068ee commit 5476c8d
Show file tree
Hide file tree
Showing 16 changed files with 156 additions and 139 deletions.
64 changes: 32 additions & 32 deletions DashWallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6798,7 +6798,7 @@
CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
Expand All @@ -6824,7 +6824,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Dash;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -6847,7 +6847,7 @@
CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down Expand Up @@ -6882,7 +6882,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Dash;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "DashWallet/dashwallet-Bridging-Header.h";
Expand Down Expand Up @@ -6962,12 +6962,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Info.plist;
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
Expand All @@ -6984,12 +6984,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Info.plist;
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
Expand All @@ -7004,13 +7004,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = C98AA93FF5283EC6405BCE4B /* Pods-WatchApp Extension.debug.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
ENABLE_BITCODE = YES;
EXCLUDED_ARCHS = "";
INFOPLIST_FILE = "WatchApp Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
Expand All @@ -7027,13 +7027,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CE02413EF0C60B1D1EDE6457 /* Pods-WatchApp Extension.release.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
ENABLE_BITCODE = YES;
EXCLUDED_ARCHS = "";
INFOPLIST_FILE = "WatchApp Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
Expand All @@ -7051,7 +7051,7 @@
baseConfigurationReference = 206554BC730E9F2BB594D044 /* Pods-TodayExtension.debug.xcconfig */;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwalletTodayExtension.entitlements;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
Expand All @@ -7061,7 +7061,7 @@
INFOPLIST_FILE = TodayExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -7076,7 +7076,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwalletTodayExtension.entitlements;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
Expand All @@ -7086,7 +7086,7 @@
INFOPLIST_FILE = TodayExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -7168,7 +7168,7 @@
CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand Down Expand Up @@ -7203,7 +7203,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Dash;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "DashWallet/dashwallet-Bridging-Header.h";
Expand All @@ -7221,7 +7221,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwalletTodayExtension.entitlements;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
Expand All @@ -7231,7 +7231,7 @@
INFOPLIST_FILE = TodayExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -7278,12 +7278,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Info.plist;
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
Expand All @@ -7298,13 +7298,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 556B5EBEBAEA571D74FF69A3 /* Pods-WatchApp Extension.testflight.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
ENABLE_BITCODE = YES;
EXCLUDED_ARCHS = "";
INFOPLIST_FILE = "WatchApp Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
Expand Down Expand Up @@ -7395,7 +7395,7 @@
CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -7420,7 +7420,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Dash;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "DashWallet/dashwallet-Bridging-Header.h";
Expand All @@ -7437,7 +7437,7 @@
baseConfigurationReference = 8A9877BEC5093CED81768D3D /* Pods-TodayExtension.testnet.xcconfig */;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = dashwallet/dashwalletTodayExtension.entitlements;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
Expand All @@ -7447,7 +7447,7 @@
INFOPLIST_FILE = TodayExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -7493,12 +7493,12 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
EXCLUDED_ARCHS = "";
IBSC_MODULE = WatchApp_Extension;
INFOPLIST_FILE = WatchApp/Info.plist;
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
Expand All @@ -7513,13 +7513,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 29B232FD70BA2EDF87F86A56 /* Pods-WatchApp Extension.testnet.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 44RJ69WHFF;
ENABLE_BITCODE = YES;
EXCLUDED_ARCHS = "";
INFOPLIST_FILE = "WatchApp Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 6.1.3;
MARKETING_VERSION = 6.1.4;
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
Expand Down
4 changes: 4 additions & 0 deletions DashWallet/Sources/UI/Main/Views/DWTabBarView.m
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ - (instancetype)initWithFrame:(CGRect)frame {
[self addSubview:button];
[buttons addObject:button];
_homeButton = button;

#if SNAPSHOT
button.accessibilityIdentifier = @"tabbar_home_button";
#endif /* SNAPSHOT */
}

// {
Expand Down
1 change: 1 addition & 0 deletions DashWallet/Sources/UI/Onboarding/Stubs/DWPayModelStub.m
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ - (instancetype)init {
}

- (void)payToAddressFromPasteboardAvailable:(nonnull void (^)(BOOL))completion {
completion(true);
}

- (nonnull DWPaymentInput *)paymentInputWithURL:(nonnull NSURL *)url {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ enum SendAmountError: Error, ColorizedText, LocalizedError {
class SendAmountModel: BaseAmountModel {
override var isMaxButtonHidden: Bool { false }


var isSendAllowed: Bool {
amount.plainAmount > 0 && !canShowInsufficientFunds && (DWGlobalOptions.sharedInstance().isResyncingWallet == false ||
DWEnvironment.sharedInstance().currentChainManager.syncPhase == .synced)
Expand Down
2 changes: 2 additions & 0 deletions DashWallet/Sources/UI/Payments/Pay/Cells/DWPayTableViewCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ - (void)updateDetails {
self.actionButton.enabled = YES;

#if SNAPSHOT
DWPayOptionModelType type = _model.type;

if (type == DWPayOptionModelType_Pasteboard) {
self.actionButton.accessibilityIdentifier = @"send_pasteboard_button";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ extension ActionButtonViewController {
button.setTitle(actionButtonTitle, for: .normal)
button.setTitle(actionButtonDisabledTitle, for: .disabled)
button.addTarget(self, action: #selector(actionButtonAction(sender:)), for: .touchUpInside)

if _SNAPSHOT {
button?.accessibilityIdentifier = "action_button"
}

buttonContainer.addSubview(button)
actionButton = button

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,13 @@ class NumberKeyboardButton: UIView {
titleLabel.text = value.stringValue
case .delete:

let image = UIImage(systemName: "delete.backward")!.withTintColor(Styles.textColor)
let image: UIImage

if #available(iOS 15.0, *) {
image = UIImage(systemName: "delete.backward")!.withTintColor(Styles.textColor)
} else {
image = UIImage(systemName: "delete.left")!.withTintColor(Styles.textColor)
}

let textAttachment = NSTextAttachment()
textAttachment.image = image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extern CGFloat DWModalPresentedHeightPercent(void);
@interface DWModalPresentationController : UIPresentationController

@property (nonatomic, strong) DWModalInteractiveTransition *interactiveTransition;
@property (nonatomic, weak, nullable) id<DWModalPresentationControllerDelegate> delegate;
@property (nonatomic, weak, nullable) id<DWModalPresentationControllerDelegate> controllerDelegate;

@end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ - (CGRect)frameOfPresentedViewInContainerView {
const CGFloat height = CGRectGetHeight(bounds);
const CGFloat width = CGRectGetWidth(bounds);

if (self.delegate && [self.delegate respondsToSelector:@selector(contentViewHeight)]) {
CGFloat contentViewHeight = [self.delegate contentViewHeight];
if (self.controllerDelegate && [self.controllerDelegate respondsToSelector:@selector(contentViewHeight)]) {
CGFloat contentViewHeight = [self.controllerDelegate contentViewHeight];

return CGRectMake(0.0, height - contentViewHeight, width, contentViewHeight);
}
Expand Down Expand Up @@ -170,7 +170,7 @@ - (UIView *)bottomView {

- (void)tapGestureRecognizerAction:(id)sender {
if (self.interactiveTransition.interactiveTransitionAllowed) {
[self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
[self.interactiveTransition.presentedController dismissViewControllerAnimated:YES completion:nil];
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ - (nullable UIPresentationController *)presentationControllerForPresentedViewCon
DWModalPresentationController *presentationController =
[[DWModalPresentationController alloc] initWithPresentedViewController:presented
presentingViewController:presenting];
presentationController.delegate = self.modalPresentationControllerDelegate;
presentationController.controllerDelegate = self.modalPresentationControllerDelegate;
presentationController.interactiveTransition = self.interactiveTransition;
return presentationController;
}
Expand Down
8 changes: 8 additions & 0 deletions DashWallet/dashwallet-Bridging-Header.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#include "DashWallet-Prefix.pch"

#if SNAPSHOT
static const bool _SNAPSHOT = 1;
#else
static const bool _SNAPSHOT = 0;
#endif /* SNAPSHOT */

//MARK: DashSync
#import "DSTransaction.h"
#import "DSCoinbaseTransaction.h"
Expand Down
Loading

0 comments on commit 5476c8d

Please sign in to comment.