Merge pull request #714 from Syn-McJ/feat/piggycard-terms

feat(dashspend): piggycards terms and conditions

Author: Syn-McJ

DashWallet.xcodeproj/project.pbxproj

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

DashWallet/Resources/AppAssets.xcassets/Explore Dash/piggycards.logo.imageset/Contents.json

@@ -17,6 +17,6 @@
 
 class CTXConstants {
     static let baseURI = "https://spend.ctx.com/"
-    static let ctxGiftCardAgreementUrl = "https://ctx.com/gift-card-agreement/"
+    static let termsAndConditionsUrl = "https://ctx.com/gift-card-agreement/"
     static let supportEmail = "support@ctx.com"
 }

DashWallet/Resources/AppAssets.xcassets/Explore Dash/piggycards.logo.imageset/PiggyCards.png

@@ -0,0 +1,69 @@
+//  
+//  Created by Andrei Ashikhmin
+//  Copyright © 2025 Dash Core Group. All rights reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  https://opensource.org/licenses/MIT
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+enum GiftCardProvider: CaseIterable {
+    case ctx
+    case piggyCards
+    
+    var displayName: String {
+        switch self {
+        case .ctx:
+            return "CTXSpend"
+        case .piggyCards:
+            return "PiggyCards"
+        }
+    }
+    
+    var logoName: String {
+        switch self {
+        case .ctx:
+            return "ctx.logo"
+        case .piggyCards:
+            return "piggycards.logo"
+        }
+    }
+    
+    var termsUrl: String {
+        switch self {
+        case .ctx:
+            return CTXConstants.termsAndConditionsUrl
+        case .piggyCards:
+            return "https://piggy.cards/index.php?route=information/information&information_id=5"
+        }
+    }
+    
+    var supportEmail: String {
+        switch self {
+        case .ctx:
+            return CTXConstants.supportEmail
+        case .piggyCards:
+            return "" // TODO: Confirm correct support email
+        }
+    }
+    
+    func isUserSignedIn() -> Bool {
+        switch self {
+        case .ctx:
+            return CTXSpendService.shared.isUserSignedIn
+        case .piggyCards:
+            // TODO: Implement PiggyCards authentication
+            return false
+        }
+    }
+}

DashWallet/Resources/AppAssets.xcassets/Explore Dash/piggycards.logo.imageset/PiggyCards@2x.png

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

DashWallet/Resources/AppAssets.xcassets/Explore Dash/piggycards.logo.imageset/PiggyCards@3x.png

@@ -646,7 +646,7 @@
             <color red="0.45882352941176469" green="0.50196078431372548" blue="0.54117647058823526" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <systemColor name="systemPinkColor">
-            <color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.1764705882" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

DashWallet/Sources/Models/Explore Dash/Model/CTXConstants.swift

@@ -139,11 +139,11 @@ extension PointOfUseDetailsViewController {
             vc.sellDashHandler = wSelf.sellDashHandler
             wSelf.navigationController?.pushViewController(vc, animated: true)
         }
-        detailsView.buyGiftCardHandler = { [weak self] in
-            self?.showDashSpendPayScreen()
+        detailsView.buyGiftCardHandler = { [weak self] provider in
+            self?.showDashSpendPayScreen(provider: provider)
         }
-        detailsView.dashSpendAuthHandler = { [weak self] in
-            self?.showCTXSpendLoginInfo()
+        detailsView.dashSpendAuthHandler = { [weak self] provider in
+            self?.showDashSpendLoginInfo(provider: provider)
         }
 
         detailsView.translatesAutoresizingMaskIntoConstraints = false
@@ -181,52 +181,55 @@ extension PointOfUseDetailsViewController {
 // Mark: DashSpend
 
 extension PointOfUseDetailsViewController {
-    private func showCTXSpendLoginInfo() {
-        let swiftUIView = CTXSpendLoginInfoView(
+    // TODO: This is a temporary UI element for testing/selecting between services
+    // Will be removed once service selection is finalized
+    private func showDashSpendLoginInfo(provider: GiftCardProvider) {
+        let swiftUIView = DashSpendLoginInfoView(
+            provider: provider,
             onCreateNewAccount: { [weak self] in
                 self?.dismiss(animated: true) {
-                    self?.showCTXSpendTerms()
+                    self?.showDashSpendTerms(provider: provider)
                 }
             },
             onLogIn: { [weak self] in
                 self?.dismiss(animated: true) {
-                    self?.showCTXSpendAuth(authType: .signIn)
+                    self?.showDashSpendAuth(authType: .signIn, provider: provider)
                 }
             },
             onTermsAndConditions: {
-                UIApplication.shared.open(URL(string: CTXConstants.ctxGiftCardAgreementUrl)!, options: [:], completionHandler: nil)
+                UIApplication.shared.open(URL(string: provider.termsUrl)!, options: [:], completionHandler: nil)
             }
         )
         let hostingController = UIHostingController(rootView: swiftUIView)
         hostingController.setDetent(450)
         self.present(hostingController, animated: true)
     }
 
-    private func showCTXSpendTerms() {
+    private func showDashSpendTerms(provider: GiftCardProvider) {
         let hostingController = UIHostingController(
-            rootView: CTXSpendTermsScreen {
+            rootView: DashSpendTermsScreen(provider: provider) {
                 self.navigationController?.popToViewController(ofType: PointOfUseDetailsViewController.self, animated: false)
-                self.showDashSpendPayScreen(justAuthenticated: true)
+                self.showDashSpendPayScreen(provider: provider, justAuthenticated: true)
             }
         )
         hostingController.modalPresentationStyle = .fullScreen
         self.navigationController?.pushViewController(hostingController, animated: true)
     }
 
-    private func showCTXSpendAuth(authType: CTXSpendUserAuthType) {
+    private func showDashSpendAuth(authType: DashSpendUserAuthType, provider: GiftCardProvider) {
         let hostingController = UIHostingController(
-            rootView: CTXSpendUserAuthScreen(authType: authType) {
+            rootView: DashSpendUserAuthScreen(authType: authType) {
                 self.navigationController?.popViewController(animated: false)
-                self.showDashSpendPayScreen(justAuthenticated: true)
+                self.showDashSpendPayScreen(provider: provider, justAuthenticated: true)
             }
         )
 
         self.navigationController?.pushViewController(hostingController, animated: true)
     }
 
-    private func showDashSpendPayScreen(justAuthenticated: Bool = false) {
+    private func showDashSpendPayScreen(provider: GiftCardProvider, justAuthenticated: Bool = false) {
         let hostingController = UIHostingController(
-            rootView: DashSpendPayScreen(merchant: self.pointOfUse, justAuthenticated: justAuthenticated) { [weak self] txId in
+            rootView: DashSpendPayScreen(merchant: self.pointOfUse, provider: provider, justAuthenticated: justAuthenticated) { [weak self] txId in
                 // Navigate back to home and show gift card details
                 self?.onGiftCardPurchased?(txId)
             }