Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PWN-9208] Fetch saved place of birth. Striga Registration #1449

Merged
merged 3 commits into from
Jul 10, 2023
Merged

[PWN-9208] Fetch saved place of birth. Striga Registration #1449

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d18229e
[PWN-9208] Fetch saved place of birth. Striga Registration
Jul 10, 2023
a9dbbdd
Remove unnecessary MainActor call
Jul 10, 2023
980fc27
[PWN-9208] Remove unnecessary method
Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions ...Main/BankTransfer/StrigaRegistration/FirstStep/StrigaRegistrationFirstStepViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@ private extension StrigaRegistrationFirstStepViewModel {
throw StrigaProviderError.invalidResponse
}

await fetchPhoneNumber(data: data)
if let countries = try? await self.countriesService.fetchCountries() {
await fetchSaved(placeOfBirth: data.placeOfBirth, countries: countries)
await fetchPhoneNumber(data: data, countries: countries)
}

await MainActor.run {
// save data
self.data = data
Expand All @@ -143,7 +147,6 @@ private extension StrigaRegistrationFirstStepViewModel {
.joined(separator: ".")
}
} catch {
// TODO: - Handle error
self.data = StrigaUserDetailsResponse.empty
await MainActor.run {
isLoading = false
Expand All @@ -152,8 +155,17 @@ private extension StrigaRegistrationFirstStepViewModel {
}
}

func fetchPhoneNumber(data: StrigaUserDetailsResponse) async {
let countries = try? await countriesService.fetchCountries()
func fetchSaved(placeOfBirth: String?, countries: Countries) async {
if let country = countries.first(where: {
$0.alpha3Code.lowercased() == placeOfBirth?.lowercased()
}) {
await MainActor.run {
lisemyon marked this conversation as resolved.
Show resolved Hide resolved
self.selectedCountryOfBirth = country
}
}
}

func fetchPhoneNumber(data: StrigaUserDetailsResponse, countries: Countries) async {
let metadataService: WalletMetadataService = Resolver.resolve()
// Web3 phone by default
var metaPhoneNumber: String = metadataService.metadata.value?.phoneNumber ?? ""
Expand All @@ -167,7 +179,7 @@ private extension StrigaRegistrationFirstStepViewModel {
phoneNumber = metaPhoneNumber
if let number = try? phoneNumberKit.parse(phoneNumber) {
phoneNumberModel = number
selectedPhoneCountryCode = countries?.first(where: {
selectedPhoneCountryCode = countries.first(where: {
if let regionId = number.regionID {
return $0.code.lowercased() == regionId.lowercased()
} else {
Expand All @@ -177,7 +189,7 @@ private extension StrigaRegistrationFirstStepViewModel {
phoneNumber = phoneNumberKit.format(number, toType: .international, withPrefix: false)
.replacingOccurrences(of: "-", with: "")
} else {
selectedPhoneCountryCode = countries?.first(where: { $0.dialCode == "\(data.mobile.countryCode)" })
selectedPhoneCountryCode = countries.first(where: { $0.dialCode == "\(data.mobile.countryCode)" })
phoneNumber = data.mobile.number
}
}
Expand Down
5 changes: 1 addition & 4 deletions ...in/BankTransfer/StrigaRegistration/SecondStep/StrigaRegistrationSecondStepViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,7 @@ private extension StrigaRegistrationSecondStepViewModel {
Task {
let countries = try await self.countriesService.fetchCountries()
if let country = countries.first(where: {
if let cached = userData.address?.country {
return $0.code.lowercased() == cached.lowercased()
}
return $0.alpha3Code.lowercased() == userData.placeOfBirth?.lowercased()
$0.code.lowercased() == userData.address?.country?.lowercased()
}) {
self.selectedCountry = country
}
Expand Down
Loading