From 66ad2a5a00bb18335b36fadd7e788a268fa30949 Mon Sep 17 00:00:00 2001 From: ivanlele Date: Fri, 24 Jan 2025 14:39:24 +0200 Subject: [PATCH] Remove UnsupportedCountryView and update related logic in PassportCard and ScanPassportView; bump marketing version to 2.1.5 --- Rarime.xcodeproj/project.pbxproj | 15 ++----- .../Modules/Home/Views/PassportCard.swift | 2 +- .../ScanPassport/Views/ScanPassportView.swift | 11 +---- .../Views/UnsupportedCountryView.swift | 44 ------------------- Rarime/Resources/Localizable.xcstrings | 3 -- 5 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 Rarime/Code/Modules/ScanPassport/Views/UnsupportedCountryView.swift diff --git a/Rarime.xcodeproj/project.pbxproj b/Rarime.xcodeproj/project.pbxproj index b6c1f414..c30bb17d 100644 --- a/Rarime.xcodeproj/project.pbxproj +++ b/Rarime.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 56062B9A2C12007A00C9BF9B /* Country.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56062B992C12007A00C9BF9B /* Country.swift */; }; 56062B9C2C12032700C9BF9B /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56062B9B2C12032700C9BF9B /* Constants.swift */; }; - 56062B9E2C12096E00C9BF9B /* UnsupportedCountryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56062B9D2C12096E00C9BF9B /* UnsupportedCountryView.swift */; }; 56062BA02C120B3400C9BF9B /* WaitlistPassportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56062B9F2C120B3400C9BF9B /* WaitlistPassportView.swift */; }; 5609B6C82C188C7500CB6A1F /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 5609B6C72C188C7500CB6A1F /* MarkdownUI */; }; 5609B6CA2C18950700CB6A1F /* ClaimRewardsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5609B6C92C18950700CB6A1F /* ClaimRewardsView.swift */; }; @@ -326,8 +325,6 @@ CEF2513A2BD6E22700050507 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF251392BD6E22700050507 /* User.swift */; }; CEF723142BF4BB9000E79198 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF723132BF4BB9000E79198 /* Errors.swift */; }; CEF8C7F72BE0DE9700F8E1A4 /* CosmosTransferResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF8C7F62BE0DE9700F8E1A4 /* CosmosTransferResponse.swift */; }; - CEFE17342D31270B00C0CDE7 /* DocumentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEFE17332D31270600C0CDE7 /* DocumentType.swift */; }; - CEFE17352D31270B00C0CDE7 /* DocumentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEFE17332D31270600C0CDE7 /* DocumentType.swift */; }; CEFE5F352CB522A700498F39 /* RegisterIdentityCircuitType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEFE5F342CB522A700498F39 /* RegisterIdentityCircuitType.swift */; }; CEFE5F372CB5471600498F39 /* SupportRegisterIdentityCircuitSignatureType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEFE5F362CB5471600498F39 /* SupportRegisterIdentityCircuitSignatureType.swift */; }; CEFE5F392CB56C8700498F39 /* CryptoUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEFE5F382CB56C8700498F39 /* CryptoUtils.swift */; }; @@ -367,7 +364,6 @@ /* Begin PBXFileReference section */ 56062B992C12007A00C9BF9B /* Country.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Country.swift; sourceTree = ""; }; 56062B9B2C12032700C9BF9B /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; - 56062B9D2C12096E00C9BF9B /* UnsupportedCountryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsupportedCountryView.swift; sourceTree = ""; }; 56062B9F2C120B3400C9BF9B /* WaitlistPassportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistPassportView.swift; sourceTree = ""; }; 5609B6C92C18950700CB6A1F /* ClaimRewardsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClaimRewardsView.swift; sourceTree = ""; }; 5609B6CB2C19922400CB6A1F /* LinearProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinearProgressView.swift; sourceTree = ""; }; @@ -656,7 +652,6 @@ CEF56DE82CF5D9D600F4A477 /* witnesscalc_registerIdentity_24_256_3_4_336_232_NA.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = witnesscalc_registerIdentity_24_256_3_4_336_232_NA.h; sourceTree = ""; }; CEF723132BF4BB9000E79198 /* Errors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = ""; }; CEF8C7F62BE0DE9700F8E1A4 /* CosmosTransferResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CosmosTransferResponse.swift; sourceTree = ""; }; - CEFE17332D31270600C0CDE7 /* DocumentType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentType.swift; sourceTree = ""; }; CEFE5F342CB522A700498F39 /* RegisterIdentityCircuitType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterIdentityCircuitType.swift; sourceTree = ""; }; CEFE5F362CB5471600498F39 /* SupportRegisterIdentityCircuitSignatureType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportRegisterIdentityCircuitSignatureType.swift; sourceTree = ""; }; CEFE5F382CB56C8700498F39 /* CryptoUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptoUtils.swift; sourceTree = ""; }; @@ -1010,7 +1005,6 @@ isa = PBXGroup; children = ( 56933DEE2BBABD100068C894 /* ScanPassportView.swift */, - 56062B9D2C12096E00C9BF9B /* UnsupportedCountryView.swift */, 56933DF22BBAC2940068C894 /* ScanPassportMRZView.swift */, 563706782C5CF374002F3AF4 /* MrzFormView.swift */, 56933DF42BBAC42E0068C894 /* ReadPassportNFCView.swift */, @@ -1813,7 +1807,6 @@ CE3E0D3B2C2025CE0039DD50 /* AFError+RetriveOpenApiHttpCode.swift in Sources */, CEC562112BD926AA002D4954 /* ZKUtils.swift in Sources */, 560F0C232BD02DFD00067054 /* WalletSendView.swift in Sources */, - 56062B9E2C12096E00C9BF9B /* UnsupportedCountryView.swift in Sources */, 56F48BBE2BC02E82001F3AA4 /* AppButton.swift in Sources */, C755128A2C860414000258AD /* Videos.swift in Sources */, 56E2D9222BCFBA0B006E725D /* PassportImageView.swift in Sources */, @@ -2481,7 +2474,7 @@ "$(inherited)", "$(PROJECT_DIR)/Frameworks", ); - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.5; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-lc++"; PRODUCT_BUNDLE_IDENTIFIER = Rarilabs.Rarime; @@ -2534,7 +2527,7 @@ "$(inherited)", "$(PROJECT_DIR)/Frameworks", ); - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.5; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-lc++"; PRODUCT_BUNDLE_IDENTIFIER = Rarilabs.Rarime; @@ -2653,7 +2646,7 @@ "$(inherited)", "$(PROJECT_DIR)/Frameworks", ); - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.5; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-lc++"; PRODUCT_BUNDLE_IDENTIFIER = Rarilabs.Rarime; @@ -2765,7 +2758,7 @@ "$(inherited)", "$(PROJECT_DIR)/Frameworks", ); - MARKETING_VERSION = 2.1.3; + MARKETING_VERSION = 2.1.5; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-lc++"; PRODUCT_BUNDLE_IDENTIFIER = Rarilabs.Rarime; diff --git a/Rarime/Code/Modules/Home/Views/PassportCard.swift b/Rarime/Code/Modules/Home/Views/PassportCard.swift index cedab0d6..10209ed3 100644 --- a/Rarime/Code/Modules/Home/Views/PassportCard.swift +++ b/Rarime/Code/Modules/Home/Views/PassportCard.swift @@ -21,7 +21,7 @@ struct PassportCard: View { } var isBadgeShown: Bool { - isWaitlist || isUnsupported + isWaitlist } var body: some View { diff --git a/Rarime/Code/Modules/ScanPassport/Views/ScanPassportView.swift b/Rarime/Code/Modules/ScanPassport/Views/ScanPassportView.swift index 26e030c2..26056758 100644 --- a/Rarime/Code/Modules/ScanPassport/Views/ScanPassportView.swift +++ b/Rarime/Code/Modules/ScanPassport/Views/ScanPassportView.swift @@ -7,7 +7,6 @@ private enum ScanPassportState { case readNFC case chipError case selectData - case unsupportedCountry case generateProof case waitlistPassport } @@ -90,20 +89,12 @@ struct ScanPassportView: View { case .selectData: SelectPassportDataView( onNext: { - let isSupportedCountry = !UNSUPPORTED_REWARD_COUNTRIES.contains(passportViewModel.passportCountry) - withAnimation { state = isSupportedCountry ? .generateProof : .unsupportedCountry } + withAnimation { state = .generateProof } }, onClose: onClose ) .environmentObject(passportViewModel) .transition(.backslide) - case .unsupportedCountry: - UnsupportedCountryView( - onCreate: { withAnimation { state = .generateProof } }, - onCancel: onClose - ) - .environmentObject(passportViewModel) - .transition(.backslide) case .generateProof: PassportProofView( onFinish: { registerZKProof in diff --git a/Rarime/Code/Modules/ScanPassport/Views/UnsupportedCountryView.swift b/Rarime/Code/Modules/ScanPassport/Views/UnsupportedCountryView.swift deleted file mode 100644 index 2fcc6001..00000000 --- a/Rarime/Code/Modules/ScanPassport/Views/UnsupportedCountryView.swift +++ /dev/null @@ -1,44 +0,0 @@ -import SwiftUI - -struct UnsupportedCountryView: View { - @EnvironmentObject var passportViewModel: PassportViewModel - - let onCreate: () -> Void - let onCancel: () -> Void - - var country: Country { - passportViewModel.passportCountry - } - - var body: some View { - VStack(spacing: 16) { - HomeIntroLayout( - title: String(localized: "Unsupported country"), - description: country.name, - icon: Text(country.flag) - .h4() - .frame(width: 72, height: 72) - .background(.componentPrimary, in: Circle()) - .foregroundStyle(.textPrimary) - ) { - Text("Unfortunately, these passports are not eligible for rewards. However, you can use your incognito ID for other upcoming mini apps.") - .body3() - .foregroundStyle(.textPrimary) - } - Spacer() - VStack(spacing: 12) { - AppButton(text: "Create Incognito ID", rightIcon: Icons.arrowRight, action: onCreate) - .controlSize(.large) - AppButton(variant: .tertiary, text: "Cancel", action: onCancel) - .controlSize(.large) - } - .padding(.horizontal, 24) - } - .padding(.top, 24) - } -} - -#Preview { - UnsupportedCountryView(onCreate: {}, onCancel: {}) - .environmentObject(PassportViewModel()) -} diff --git a/Rarime/Resources/Localizable.xcstrings b/Rarime/Resources/Localizable.xcstrings index b81fa736..f3c5fbdb 100644 --- a/Rarime/Resources/Localizable.xcstrings +++ b/Rarime/Resources/Localizable.xcstrings @@ -707,9 +707,6 @@ } } } - }, - "Create Incognito ID" : { - }, "Create your digital identity" : {