Merge pull request #701 from Syn-McJ/feat/dashspend-pay-ui

feat(dashspend): buy gift card UI

Author: Syn-McJ

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

@@ -57,7 +57,7 @@ extension ExplorePointOfUse {
         let paymentMethod: PaymentMethod
         let type: `Type`
         let deeplink: String?
-        let savingsPercentage: Int
+        let savingsBasisPoints: Int // in basis points 1 = 0.001%
     }
 
     var merchant: Merchant? {
@@ -221,7 +221,7 @@ extension ExplorePointOfUse: RowDecodable {
             let savingsPercentage = row[ExplorePointOfUse.savingPercentage]
             category = .merchant(Merchant(merchantId: merchantId,
                                           paymentMethod: Merchant.PaymentMethod(rawValue: paymentMethodRaw)!,
-                                          type: type, deeplink: deeplink, savingsPercentage: savingsPercentage))
+                                          type: type, deeplink: deeplink, savingsBasisPoints: savingsPercentage))
         } else if let manufacturer = try? row.get(ExplorePointOfUse.manufacturer) {
             let type: Atm.`Type`! = .init(rawValue: row[ExplorePointOfUse.type])
             category = .atm(Atm(manufacturer: manufacturer, type: type))

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

@@ -47,6 +47,7 @@ + (NSString *)transactionURLFormat {
 
 + (NSString *)logoutURLString {
     return @"https://uphold.com/";
+
 }
 
 @end

DashWallet/Sources/Models/DWGlobalOptions.h

@@ -138,6 +138,9 @@ extension PointOfUseDetailsViewController {
             wSelf.navigationController?.pushViewController(vc, animated: true)
         }
         detailsView.buyGiftCardHandler = { [weak self] in
+            self?.showDashSpendPayScreen()
+        }
+        detailsView.dashSpendAuthHandler = { [weak self] in
             self?.showCTXSpendLoginInfo()
         }
 
@@ -180,15 +183,33 @@ extension PointOfUseDetailsViewController {
     }
 
     private func showCTXSpendTerms() {
-        let hostingController = UIHostingController(rootView: CTXSpendTermsScreen())
+        let hostingController = UIHostingController(
+            rootView: CTXSpendTermsScreen {
+                self.navigationController?.popToViewController(ofType: PointOfUseDetailsViewController.self, animated: false)
+                self.showDashSpendPayScreen(justAuthenticated: true)
+            }
+        )
         hostingController.modalPresentationStyle = .fullScreen
         self.navigationController?.pushViewController(hostingController, animated: true)
     }
 
     private func showCTXSpendAuth(authType: CTXSpendUserAuthType) {
         let hostingController = UIHostingController(
             rootView: NavigationView {
-                CTXSpendUserAuthScreen(authType: authType)
+                CTXSpendUserAuthScreen(authType: authType) {
+                    self.navigationController?.popViewController(animated: false)
+                    self.showDashSpendPayScreen(justAuthenticated: true)
+                }
+            }
+        )
+        
+        self.navigationController?.pushViewController(hostingController, animated: true)
+    }
+    
+    private func showDashSpendPayScreen(justAuthenticated: Bool = false) {
+        let hostingController = UIHostingController(
+            rootView: NavigationView {
+                DashSpendPayScreen(merchant: self.pointOfUse, justAuthenticated: justAuthenticated)
             }
         )