Merge pull request #697 from Syn-McJ/release/8.3.3

Release: 8.3.3

Author: Syn-McJ

DashSyncCurrentCommit

@@ -1 +1 @@
-fd058258f5673d96e864ed5df5d69a40c49e988e
+b6a82ef4d57754d29599b794df3274e4cd36e07a

DashWallet.xcodeproj/project.pbxproj

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "blockchair.logo.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "blockchair.logo@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "blockchair.logo@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DashWallet/Resources/AppAssets.xcassets/blockchair_logo.imageset/Contents.json

@@ -45,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL localNotificationsEnabled;
 
 @property (nonatomic, assign) BOOL balanceHidden;
+@property (nonatomic, assign) BOOL tapToHideBalanceShown;
 
 @property (nonatomic, assign) BOOL shouldDisplayOnboarding;
 @property (nonatomic, assign) BOOL shouldDisplayReclassifyYourTransactionsFlow;

DashWallet/Resources/AppAssets.xcassets/blockchair_logo.imageset/blockchair.logo.png

@@ -35,6 +35,7 @@ @implementation DWGlobalOptions
 @dynamic autoLockAppInterval;
 @dynamic shortcuts;
 @dynamic balanceHidden;
+@dynamic tapToHideBalanceShown;
 @dynamic shouldDisplayOnboarding;
 @dynamic paymentsScreenCurrentTab;
 @dynamic resyncingWallet;
@@ -147,6 +148,7 @@ - (void)restoreToDefaults {
     self.shortcuts = nil;
     self.localNotificationsEnabled = YES;
     self.balanceHidden = NO;
+    self.tapToHideBalanceShown = NO;
     self.resyncingWallet = NO;
     self.selectedPaymentCurrency = DWPaymentCurrencyDash;
     self.shouldDisplayReclassifyYourTransactionsFlow = YES;

DashWallet/Resources/AppAssets.xcassets/blockchair_logo.imageset/blockchair.logo@2x.png

@@ -22,9 +22,9 @@ import Combine
 class HomeViewController: DWBasePayViewController, NavigationBarDisplayable {
     private var cancellableBag = Set<AnyCancellable>()
     var model: DWHomeProtocol!
+    var viewModel: HomeViewModel!
     private var homeView: HomeView!
     weak var delegate: (DWHomeViewControllerDelegate & DWWipeDelegate)?
-    private let viewModel = HomeViewModel.shared
 
     #if DASHPAY
     var isBackButtonHidden: Bool = false
@@ -50,7 +50,7 @@ class HomeViewController: DWBasePayViewController, NavigationBarDisplayable {
 
     override func loadView() {
         let frame = UIScreen.main.bounds
-        homeView = HomeView(frame: frame, delegate: self)
+        homeView = HomeView(frame: frame, delegate: self, viewModel: viewModel)
         homeView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         homeView.shortcutsDelegate = self
         view = homeView
@@ -89,12 +89,6 @@ class HomeViewController: DWBasePayViewController, NavigationBarDisplayable {
         model.checkCrowdNodeState()
     }
 
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-
-        homeView.hideBalanceIfNeeded()
-    }
-
     #if DASHPAY
     func handleDeeplink(_ url: URL, definedUsername: String?) {
         if model.dashPayModel.blockchainIdentity != nil {
@@ -338,10 +332,10 @@ extension HomeViewController: TxReclassifyTransactionsInfoViewControllerDelegate
     }
 }
 
-// MARK: - DWShortcutsActionDelegate
+// MARK: - ShortcutsActionDelegate
 
 extension HomeViewController: ShortcutsActionDelegate {
-    func shortcutsView(_ view: UIView, didSelectAction action: ShortcutAction, sender: UIView) {
+    func shortcutsView(didSelectAction action: ShortcutAction, sender: UIView?) {
         performAction(for: action, sender: sender)
     }
 }

DashWallet/Resources/AppAssets.xcassets/blockchair_logo.imageset/blockchair.logo@3x.png

@@ -140,10 +140,6 @@ - (void)dealloc {
 
 - (void)setUpdatesObserver:(nullable id<DWHomeModelUpdatesObserver>)updatesObserver {
     _updatesObserver = updatesObserver;
-
-    if (self.allDataSource) {
-        [updatesObserver homeModel:self didUpdate:self.dataSource shouldAnimate:NO];
-    }
 }
 
 - (BOOL)isWalletEmpty {
@@ -223,7 +219,6 @@ - (BOOL)performOnSetupUpgrades {
                                                               if (needsCheck) {
                                                                   // Show backup reminder shortcut
                                                                   [DWGlobalOptions sharedInstance].walletNeedsBackup = YES;
-                                                                  [self.updatesObserver homeModelWantToReloadShortcuts:self];
                                                               }
                                                           }];
                        }];
@@ -290,8 +285,6 @@ - (void)handleDeeplink:(NSURL *)url
 #pragma mark - Notifications
 
 - (void)reachabilityDidChangeNotification {
-    [self.updatesObserver homeModelWantToReloadShortcuts:self];
-
     if (self.reachability.networkReachabilityStatus != DSReachabilityStatusNotReachable &&
         [UIApplication sharedApplication].applicationState != UIApplicationStateBackground) {
 
@@ -300,23 +293,23 @@ - (void)reachabilityDidChangeNotification {
 }
 
 - (void)walletBalanceDidChangeNotification {
-    [self updateBalance];
+    [self.receiveModel updateReceivingInfo];
 }
 
 - (void)applicationWillEnterForegroundNotification {
     [self startSyncIfNeeded];
 }
 
 - (void)fiatCurrencyDidChangeNotification {
-    [self updateBalance];
-    [self.updatesObserver homeModelDidChangeInnerModels:self];
+    [self.receiveModel updateReceivingInfo];
+    ;
 }
 
 - (void)chainWalletsDidChangeNotification:(NSNotification *)notification {
     DSChain *chain = [DWEnvironment sharedInstance].currentChain;
     DSChain *notificationChain = notification.userInfo[DSChainManagerNotificationChainKey];
     if (notificationChain && notificationChain == chain) {
-        [self updateBalance];
+        [self.receiveModel updateReceivingInfo];
     }
 }
 
@@ -337,11 +330,6 @@ - (void)startSyncIfNeeded {
     }
 }
 
-- (void)updateBalance {
-    [self.receiveModel updateReceivingInfo];
-    [self.updatesObserver homeModelWantToReloadShortcuts:self];
-}
-
 #pragma mark SyncingActivityMonitorObserver
 
 - (void)syncingActivityMonitorProgressDidChange:(double)progress {
@@ -363,7 +351,7 @@ - (void)syncingActivityMonitorStateDidChangeWithPreviousState:(enum SyncingActiv
         [self checkCrowdNodeState];
     }
 
-    [self updateBalance];
+    [self.receiveModel updateReceivingInfo];
 }
 
 @end