fix: don't show close button for Screen presentation mode

dashpay · Sep 16, 2023 · 89babdb · 89babdb
1 parent 9291f74
commit 89babdb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/DashWallet/Sources/UI/Home/DWHomeViewController+DWShortcuts.m b/DashWallet/Sources/UI/Home/DWHomeViewController+DWShortcuts.m
@@ -156,6 +156,7 @@ - (void)buySellDashActionAuthenticated {
 - (void)showLocalCurrencyAction {
     DWLocalCurrencyViewController *controller =
         [[DWLocalCurrencyViewController alloc] initWithNavigationAppearance:DWNavigationAppearance_White
+                                                           presentationMode:DWCurrencyPickerPresentationMode_Dialog
                                                                currencyCode:nil];
     controller.delegate = self;
     [self presentControllerModallyInNavigationController:controller];

diff --git a/DashWallet/Sources/UI/Menu/Settings/DWSettingsMenuViewController.m b/DashWallet/Sources/UI/Menu/Settings/DWSettingsMenuViewController.m
@@ -205,6 +205,7 @@ - (void)rescanBlockchainActionFromSourceView:(UIView *)sourceView sourceRect:(CG
 - (void)showCurrencySelector {
     DWLocalCurrencyViewController *controller =
         [[DWLocalCurrencyViewController alloc] initWithNavigationAppearance:DWNavigationAppearance_Default
+                                                           presentationMode:DWCurrencyPickerPresentationMode_Screen
                                                                currencyCode:nil];
     controller.delegate = self;
     [self.navigationController pushViewController:controller animated:YES];

diff --git a/DashWallet/Sources/UI/Menu/Settings/LocalCurrency/DWLocalCurrencyViewController.h b/DashWallet/Sources/UI/Menu/Settings/LocalCurrency/DWLocalCurrencyViewController.h
@@ -21,6 +21,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef NS_ENUM(NSUInteger, DWCurrencyPickerPresentationMode) {
+    DWCurrencyPickerPresentationMode_Dialog,
+    DWCurrencyPickerPresentationMode_Screen,
+};
+
 @class DWLocalCurrencyViewController;
 
 @protocol DWLocalCurrencyViewControllerDelegate <NSObject>
@@ -37,6 +42,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL isGlobal;
 
 - (instancetype)initWithNavigationAppearance:(DWNavigationAppearance)navigationAppearance
+                                presentationMode:(DWCurrencyPickerPresentationMode)mode
                                 currencyCode:(nullable NSString *)currencyCode;
 
 @end

diff --git a/DashWallet/Sources/UI/Menu/Settings/LocalCurrency/DWLocalCurrencyViewController.m b/DashWallet/Sources/UI/Menu/Settings/LocalCurrency/DWLocalCurrencyViewController.m
@@ -33,6 +33,7 @@
 @interface DWLocalCurrencyViewController () <UISearchBarDelegate, UISearchResultsUpdating>
 
 @property (nonatomic, assign) DWNavigationAppearance navigationAppearance;
+@property (nonatomic, assign) DWCurrencyPickerPresentationMode presentationMode;
 @property (nonatomic, strong) DWLocalCurrencyModel *model;
 @property (nonatomic, strong) UILabel *priceSourceLabel;
 
@@ -41,10 +42,12 @@ @interface DWLocalCurrencyViewController () <UISearchBarDelegate, UISearchResult
 @implementation DWLocalCurrencyViewController
 
 - (instancetype)initWithNavigationAppearance:(DWNavigationAppearance)navigationAppearance
+                            presentationMode:(DWCurrencyPickerPresentationMode)mode
                                 currencyCode:(nullable NSString *)currencyCode {
     self = [super initWithStyle:UITableViewStylePlain];
     if (self) {
         self.navigationAppearance = navigationAppearance;
+        self.presentationMode = mode;
         if (navigationAppearance == DWNavigationAppearance_Default) {
             self.title = NSLocalizedString(@"Local Currency", nil);
         }
@@ -59,8 +62,10 @@ - (instancetype)initWithNavigationAppearance:(DWNavigationAppearance)navigationA
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    UIBarButtonItem *barButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemClose target:self action:@selector(closeButtonAction)];
-    self.navigationItem.rightBarButtonItem = barButton;
+    if (self.presentationMode == DWCurrencyPickerPresentationMode_Dialog) {
+        UIBarButtonItem *barButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemClose target:self action:@selector(closeButtonAction)];
+        self.navigationItem.rightBarButtonItem = barButton;
+    }
 
     self.title = NSLocalizedString(@"Local Currency", nil);
 

diff --git a/DashWallet/Sources/UI/Payments/Amount/BaseAmountViewController.swift b/DashWallet/Sources/UI/Payments/Amount/BaseAmountViewController.swift
@@ -115,6 +115,7 @@ class BaseAmountViewController: ActionButtonViewController, AmountProviding {
 
     internal func showCurrencyList() {
         let currencyController = DWLocalCurrencyViewController(navigationAppearance: .white,
+                                                               presentationMode: .dialog,
                                                                currencyCode: model.localCurrencyCode)
         currencyController.isGlobal = false
         currencyController.delegate = self