From 69888c4b1f3be02019823b14eee1f46c18cc97c0 Mon Sep 17 00:00:00 2001 From: Andrei Ashikhmin Date: Fri, 19 Jan 2024 17:40:58 +0700 Subject: [PATCH 1/4] fix: remove a-z sorting --- .../Models/Explore Dash/ExploreDash.swift | 22 ++++----- .../Infrastructure/DAO Impl/AtmDAO.swift | 4 +- .../Infrastructure/DAO Impl/MerchantDAO.swift | 21 +++------ .../List/AtmListViewController.swift | 3 +- .../Model/PointOfUseListFiltersModel.swift | 47 ------------------- .../PointOfUseListFiltersViewController.swift | 5 +- .../List/MerchantListViewController.swift | 3 +- .../List/Model/MerchantsDataProvider.swift | 9 ++-- DashWallet/ar.lproj/Localizable.strings | 12 ----- DashWallet/bg.lproj/Localizable.strings | 12 ----- DashWallet/ca.lproj/Localizable.strings | 12 ----- DashWallet/cs.lproj/Localizable.strings | 12 ----- DashWallet/da.lproj/Localizable.strings | 12 ----- DashWallet/de.lproj/Localizable.strings | 12 ----- DashWallet/el.lproj/Localizable.strings | 12 ----- DashWallet/en.lproj/Localizable.strings | 12 ----- DashWallet/eo.lproj/Localizable.strings | 12 ----- DashWallet/es.lproj/Localizable.strings | 12 ----- DashWallet/et.lproj/Localizable.strings | 12 ----- DashWallet/fa.lproj/Localizable.strings | 12 ----- DashWallet/fi.lproj/Localizable.strings | 12 ----- DashWallet/fil.lproj/Localizable.strings | 12 ----- DashWallet/fr.lproj/Localizable.strings | 12 ----- DashWallet/hr.lproj/Localizable.strings | 12 ----- DashWallet/hu.lproj/Localizable.strings | 12 ----- DashWallet/id.lproj/Localizable.strings | 12 ----- DashWallet/it.lproj/Localizable.strings | 12 ----- DashWallet/ja.lproj/Localizable.strings | 12 ----- DashWallet/ko.lproj/Localizable.strings | 12 ----- DashWallet/mk.lproj/Localizable.strings | 12 ----- DashWallet/ms.lproj/Localizable.strings | 12 ----- DashWallet/nb.lproj/Localizable.strings | 12 ----- DashWallet/nl.lproj/Localizable.strings | 12 ----- DashWallet/pl.lproj/Localizable.strings | 12 ----- DashWallet/pt.lproj/Localizable.strings | 12 ----- DashWallet/ro.lproj/Localizable.strings | 12 ----- DashWallet/ru.lproj/Localizable.strings | 12 ----- DashWallet/sk.lproj/Localizable.strings | 12 ----- DashWallet/sl.lproj/Localizable.strings | 12 ----- DashWallet/sl_SI.lproj/Localizable.strings | 12 ----- DashWallet/sq.lproj/Localizable.strings | 12 ----- DashWallet/sr.lproj/Localizable.strings | 12 ----- DashWallet/sv.lproj/Localizable.strings | 12 ----- DashWallet/th.lproj/Localizable.strings | 12 ----- DashWallet/tr.lproj/Localizable.strings | 12 ----- DashWallet/uk.lproj/Localizable.strings | 12 ----- DashWallet/vi.lproj/Localizable.strings | 12 ----- DashWallet/zh-Hans.lproj/Localizable.strings | 12 ----- .../zh-Hant-TW.lproj/Localizable.strings | 12 ----- DashWallet/zh.lproj/Localizable.strings | 12 ----- DashWallet/zh_TW.lproj/Localizable.strings | 12 ----- 51 files changed, 23 insertions(+), 607 deletions(-) diff --git a/DashWallet/Sources/Models/Explore Dash/ExploreDash.swift b/DashWallet/Sources/Models/Explore Dash/ExploreDash.swift index d302bfff9..a65a6cfdb 100644 --- a/DashWallet/Sources/Models/Explore Dash/ExploreDash.swift +++ b/DashWallet/Sources/Models/Explore Dash/ExploreDash.swift @@ -151,26 +151,23 @@ public class ExploreDash { extension ExploreDash { func onlineMerchants(query: String?, onlineOnly: Bool, paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, - userPoint: CLLocationCoordinate2D?, sortDirection: PointOfUseListFilters.SortDirection?, offset: Int = 0, + userPoint: CLLocationCoordinate2D?, offset: Int = 0, completion: @escaping (Swift.Result, Error>) -> Void) { - merchantDAO.onlineMerchants(query: query, onlineOnly: onlineOnly, userPoint: userPoint, paymentMethods: paymentMethods, - sortDirection: sortDirection, offset: offset, completion: completion) + merchantDAO.onlineMerchants(query: query, onlineOnly: onlineOnly, userPoint: userPoint, paymentMethods: paymentMethods, offset: offset, completion: completion) } func nearbyMerchants(by query: String?, in bounds: ExploreMapBounds?, userPoint: CLLocationCoordinate2D?, - paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, sortBy: PointOfUseListFilters.SortBy?, - sortDirection: PointOfUseListFilters.SortDirection?, territory: Territory?, offset: Int = 0, + paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, sortBy: PointOfUseListFilters.SortBy?, territory: Territory?, offset: Int = 0, completion: @escaping (Swift.Result, Error>) -> Void) { - merchantDAO.nearbyMerchants(by: query, in: bounds, userPoint: userPoint, paymentMethods: paymentMethods, sortBy: sortBy, - sortDirection: sortDirection, territory: territory, offset: offset, completion: completion) + merchantDAO.nearbyMerchants(by: query, in: bounds, userPoint: userPoint, paymentMethods: paymentMethods, sortBy: sortBy, territory: territory, offset: offset, completion: completion) } func allMerchants(by query: String?, in bounds: ExploreMapBounds?, userPoint: CLLocationCoordinate2D?, - paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, sortBy: PointOfUseListFilters.SortBy?, - sortDirection: PointOfUseListFilters.SortDirection?, territory: Territory?, offset: Int = 0, + paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, + sortBy: PointOfUseListFilters.SortBy?, + territory: Territory?, offset: Int = 0, completion: @escaping (Swift.Result, Error>) -> Void) { - merchantDAO.allMerchants(by: query, in: bounds, userPoint: userPoint, paymentMethods: paymentMethods, sortBy: sortBy, - sortDirection: sortDirection, territory: territory, offset: offset, completion: completion) + merchantDAO.allMerchants(by: query, in: bounds, userPoint: userPoint, paymentMethods: paymentMethods, sortBy: sortBy, territory: territory, offset: offset, completion: completion) } func allLocations(for merchantId: Int64, in bounds: ExploreMapBounds?, userPoint: CLLocationCoordinate2D?, @@ -196,8 +193,7 @@ extension ExploreDash { .types: types, .bounds: bounds, .userLocation: userPoint, - .territory: filters?.territory, - .sortDirection: filters?.sortNameDirection, + .territory: filters?.territory ] atmDAO.items(filters: filters, offset: offset, completion: completion) diff --git a/DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/AtmDAO.swift b/DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/AtmDAO.swift index 988cc6782..7299f75d8 100644 --- a/DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/AtmDAO.swift +++ b/DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/AtmDAO.swift @@ -66,9 +66,7 @@ class AtmDAO: PointOfUseDAO { .filter(queryFilter) - if let sortDirection = filters[.sortDirection] as? PointOfUseListFilters.SortDirection { - query = query.order(sortDirection == .ascending ? name.collate(.nocase).asc : name.collate(.nocase).desc) - } else if let userLocation = filters[.userLocation] as? CLLocationCoordinate2D { + if let userLocation = filters[.userLocation] as? CLLocationCoordinate2D { let anchorLatitude = userLocation.latitude let anchorLongitude = userLocation.longitude diff --git a/DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/MerchantDAO.swift b/DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/MerchantDAO.swift index 4a95391ab..2b7d2229b 100644 --- a/DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/MerchantDAO.swift +++ b/DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/MerchantDAO.swift @@ -44,7 +44,6 @@ class MerchantDAO: PointOfUseDAO { types: [ExplorePointOfUse.Merchant.`Type`], paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, sortBy: PointOfUseListFilters.SortBy?, - sortDirection: PointOfUseListFilters.SortDirection?, territory: Territory?, offset: Int, completion: @escaping (Swift.Result, Error>) -> Void) { @@ -109,7 +108,7 @@ class MerchantDAO: PointOfUseDAO { Expression(literal: "((latitude-\(anchorLatitude))*(latitude-\(anchorLatitude))) + ((longitude - \(anchorLongitude))*(longitude - \(anchorLongitude))) ASC") } - let nameOrdering = sortDirection == .descending ? name.collate(.nocase).desc : name.collate(.nocase).asc + let nameOrdering = name.collate(.nocase).asc if let sortBy, sortBy == .name { query = query.order(nameOrdering) @@ -145,29 +144,23 @@ class MerchantDAO: PointOfUseDAO { extension MerchantDAO { func onlineMerchants(query: String?, onlineOnly: Bool, userPoint: CLLocationCoordinate2D?, - paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, - sortDirection: PointOfUseListFilters.SortDirection?, offset: Int = 0, + paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, offset: Int = 0, completion: @escaping (Swift.Result, Error>) -> Void) { items(query: query, bounds: nil, userLocation: userPoint, types: [.online, .onlineAndPhysical], - paymentMethods: paymentMethods, sortBy: nil, sortDirection: sortDirection, territory: nil, offset: offset, - completion: completion) + paymentMethods: paymentMethods, sortBy: nil, territory: nil, offset: offset, completion: completion) } func nearbyMerchants(by query: String?, in bounds: ExploreMapBounds?, userPoint: CLLocationCoordinate2D?, - paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, sortBy: PointOfUseListFilters.SortBy?, - sortDirection: PointOfUseListFilters.SortDirection?, territory: Territory?, offset: Int = 0, + paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, sortBy: PointOfUseListFilters.SortBy?, territory: Territory?, offset: Int = 0, completion: @escaping (Swift.Result, Error>) -> Void) { items(query: query, bounds: bounds, userLocation: userPoint, types: [.physical, .onlineAndPhysical], - paymentMethods: paymentMethods, sortBy: sortBy, sortDirection: sortDirection, territory: territory, offset: offset, - completion: completion) + paymentMethods: paymentMethods, sortBy: sortBy, territory: territory, offset: offset, completion: completion) } func allMerchants(by query: String?, in bounds: ExploreMapBounds?, userPoint: CLLocationCoordinate2D?, - paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, sortBy: PointOfUseListFilters.SortBy?, - sortDirection: PointOfUseListFilters.SortDirection?, territory: Territory?, offset: Int = 0, + paymentMethods: [ExplorePointOfUse.Merchant.PaymentMethod]?, sortBy: PointOfUseListFilters.SortBy?, territory: Territory?, offset: Int = 0, completion: @escaping (Swift.Result, Error>) -> Void) { - items(query: query, bounds: bounds, userLocation: userPoint, types: [.online, .onlineAndPhysical, .physical], - paymentMethods: paymentMethods, sortBy: sortBy, sortDirection: sortDirection, territory: territory, offset: offset, + items(query: query, bounds: bounds, userLocation: userPoint, types: [.online, .onlineAndPhysical, .physical], paymentMethods: paymentMethods, sortBy: sortBy, territory: territory, offset: offset, completion: completion) } diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/AtmListViewController.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/AtmListViewController.swift index bfd6b6e89..3193b98c0 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/AtmListViewController.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/AtmListViewController.swift @@ -31,7 +31,6 @@ enum AtmListSegmnets: Int { var pointOfUseListSegment: PointOfUseListSegment { var defaultFilters = PointOfUseListFilters() - defaultFilters.sortNameDirection = .ascending defaultFilters.radius = .twenty return .init(tag: rawValue, title: title, showMap: true, showLocationServiceSettings: false, showReversedLocation: true, @@ -68,7 +67,7 @@ extension AtmListSegmnets { } var filterGroups: [PointOfUseListFiltersGroup] { - [.sortByName, .territory, .radius, .locationService] + [.sortByDistanceOrName, .territory, .radius, .locationService] } var territories: TerritoryDataSource { diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/Model/PointOfUseListFiltersModel.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/Model/PointOfUseListFiltersModel.swift index 8b09ca5f0..9aebd0058 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/Model/PointOfUseListFiltersModel.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/Model/PointOfUseListFiltersModel.swift @@ -39,17 +39,6 @@ extension PointOfUseListFilters.SortBy { } } -extension PointOfUseListFilters.SortDirection { - var filterLocalizedString: String { - switch self { - case .ascending: - return NSLocalizedString("Sorting: A to Z", comment: "Explore Dash/Filters") - case .descending: - return NSLocalizedString("Sorting: Z to A", comment: "Explore Dash/Filters") - } - } -} - // MARK: - PointOfUseListFilters struct PointOfUseListFilters: Equatable { @@ -59,11 +48,6 @@ struct PointOfUseListFilters: Equatable { case name } - enum SortDirection { - case ascending - case descending - } - enum Radius: Int { case one = 1 case five = 5 @@ -98,7 +82,6 @@ struct PointOfUseListFilters: Equatable { } var sortBy: SortBy? - var sortNameDirection: SortDirection? var merchantPaymentTypes: [ExplorePointOfUse.Merchant.PaymentMethod]? var radius: Radius? var territory: Territory? @@ -138,10 +121,6 @@ struct PointOfUseListFilters: Equatable { string.append(value.filterLocalizedString) } - if let value = sortNameDirection { - string.append(value.filterLocalizedString) - } - return string.isEmpty ? nil : string.joined(separator: ", ") } } @@ -154,10 +133,6 @@ extension PointOfUseListFilters { set.insert(value == .name ? .sortName : .sortDistance) } - if let value = sortNameDirection { - set.insert(value == .ascending ? .sortAZ : .sortZA) - } - if let value = merchantPaymentTypes { let filterItems: [PointOfUseListFilterItem] = value.map { $0 == .dash ? .paymentTypeDash : .paymentTypeGiftCard } for item in filterItems { @@ -176,8 +151,6 @@ extension PointOfUseListFilters { // MARK: - PointOfUseListFilterItem enum PointOfUseListFilterItem: String { - case sortAZ - case sortZA case sortDistance case sortName case paymentTypeDash @@ -192,10 +165,6 @@ enum PointOfUseListFilterItem: String { var otherItems: [PointOfUseListFilterItem] { switch self { - case .sortAZ: - return [.sortZA] - case .sortZA: - return [.sortAZ] case .sortDistance: return [.sortName] case .sortName: @@ -219,10 +188,6 @@ enum PointOfUseListFilterItem: String { var itemsToUnselect: [PointOfUseListFilterItem] { switch self { - case .sortAZ: - return [.sortZA] - case .sortZA: - return [.sortAZ] case .sortDistance: return [.sortName] case .sortName: @@ -260,10 +225,6 @@ enum PointOfUseListFilterItem: String { var title: String { switch self { - case .sortAZ: - return NSLocalizedString("Name: from A to Z", comment: "Explore Dash: Filters") - case .sortZA: - return NSLocalizedString("Name: from Z to A", comment: "Explore Dash: Filters") case .paymentTypeDash: return NSLocalizedString("Dash", comment: "Explore Dash: Filters") case .paymentTypeGiftCard: @@ -384,14 +345,6 @@ extension PointOfUseListFiltersModel { filters.sortBy = .distance } - if selected.contains(.sortAZ) { - filters.sortNameDirection = .ascending - } - - if selected.contains(.sortZA) { - filters.sortNameDirection = .descending - } - if selected.contains(.radius1) { filters.radius = .one } else if selected.contains(.radius5) { diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/PointOfUseListFiltersViewController.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/PointOfUseListFiltersViewController.swift index d63ddbae8..bf54da6ed 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/PointOfUseListFiltersViewController.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/PointOfUseListFiltersViewController.swift @@ -26,7 +26,6 @@ public enum PointOfUseListFiltersGroup { case paymentType case sortByDistanceOrName - case sortByName case territory case radius case locationService @@ -35,7 +34,7 @@ public enum PointOfUseListFiltersGroup { switch self { case .paymentType: return .paymentType - case .sortByName, .sortByDistanceOrName: + case .sortByDistanceOrName: return .sortBy case .territory: return .location @@ -50,8 +49,6 @@ public enum PointOfUseListFiltersGroup { switch self { case .paymentType: return [.paymentTypeDash, .paymentTypeGiftCard] - case .sortByName: - return [.sortAZ, .sortZA] case .sortByDistanceOrName: return [.sortDistance, .sortName] case .territory: diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/MerchantListViewController.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/MerchantListViewController.swift index 9ee85a9e6..333cf485a 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/MerchantListViewController.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/MerchantListViewController.swift @@ -44,7 +44,6 @@ enum MerchantsListSegment: Int { defaultFilters.merchantPaymentTypes = [.dash, .giftCard] defaultFilters.radius = .twenty defaultFilters.sortBy = .distance - defaultFilters.sortNameDirection = .ascending switch self { case .online: @@ -91,7 +90,7 @@ extension MerchantsListSegment { case .nearby: return [.sortByDistanceOrName, .radius] case .all: - return [.sortByName, .territory, .radius] + return [.sortByDistanceOrName, .territory, .radius] } } diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Model/MerchantsDataProvider.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Model/MerchantsDataProvider.swift index 667aef4e6..a02e61a21 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Model/MerchantsDataProvider.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Model/MerchantsDataProvider.swift @@ -59,7 +59,7 @@ class AllMerchantsDataProvider: NearbyMerchantsDataProvider { with filters: PointOfUseListFilters?, offset: Int, completion: @escaping (Swift.Result, Error>) -> Void) { dataSource.allMerchants(by: query, in: nil, userPoint: userPoint, paymentMethods: filters?.merchantPaymentTypes, - sortBy: filters?.sortBy, sortDirection: filters?.sortNameDirection, territory: filters?.territory, + sortBy: filters?.sortBy, territory: filters?.territory, offset: offset, completion: completion) } } @@ -102,9 +102,7 @@ class NearbyMerchantsDataProvider: PointOfUseDataProvider { internal func fetch(by query: String?, in bounds: ExploreMapBounds?, userPoint: CLLocationCoordinate2D?, with filters: PointOfUseListFilters?, offset: Int, completion: @escaping (Swift.Result, Error>) -> Void) { - dataSource.nearbyMerchants(by: query, in: bounds, userPoint: userPoint, paymentMethods: filters?.merchantPaymentTypes, - sortBy: filters?.sortBy, sortDirection: filters?.sortNameDirection, - territory: filters?.territory, offset: offset, completion: completion) + dataSource.nearbyMerchants(by: query, in: bounds, userPoint: userPoint, paymentMethods: filters?.merchantPaymentTypes, sortBy: filters?.sortBy, territory: filters?.territory, offset: offset, completion: completion) } } @@ -139,7 +137,6 @@ class OnlineMerchantsDataProvider: PointOfUseDataProvider { with filters: PointOfUseListFilters?, offset: Int, completion: @escaping (Swift.Result, Error>) -> Void) { dataSource.onlineMerchants(query: query, onlineOnly: false, paymentMethods: filters?.merchantPaymentTypes, - userPoint: userPoint, sortDirection: filters?.sortNameDirection, offset: offset, - completion: completion) + userPoint: userPoint, offset: offset, completion: completion) } } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index cbcd45714..03d46e313 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "اسم"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "قريب"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "حدد المبلغ"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 3affeaf3e..7113f611e 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Посочете сума"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 72a0a829c..abbe41355 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index d12edbc5e..a4ccd2032 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Jméno"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nejbližší"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Uvést částku"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 741489ac8..2db4c9f3b 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index f100d9d10..3b3965298 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: von A bis Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: von Z bis A"; - /* Nearby */ "Nearby" = "In der Nähe"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Nach Name sortiert"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sortieren: A bis Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sortieren: Z bis A"; - /* No comment provided by engineer. */ "Specify Amount" = "Betrag festsetzen"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 27a893b2c..6bc76b9e1 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Όνομα"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Όνομα: από το Α έως το Ω"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Όνομα: από το Ζ στο Α"; - /* Nearby */ "Nearby" = "Κοντινή τοποθεσία"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Ταξινόμηση κατά όνομα"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Ταξινόμηση: Α έως Ω"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Ταξινόμηση: Ζ προς Α"; - /* No comment provided by engineer. */ "Specify Amount" = "Καθορίστε το ποσό"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index ea106c894..43a93a53b 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 0c1046adb..6be715481 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index eed7df267..e6fd16047 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Nombre"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Nombre: desde A hasta Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Nombre: desde Z hasta A"; - /* Nearby */ "Nearby" = "Cercano"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Ordenado por nombre"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Ordenando: de A a Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Ordenando: de Z a A"; - /* No comment provided by engineer. */ "Specify Amount" = "Especificar Monto"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index aa5aaa67c..21822ce52 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 276e1fa13..927c8764b 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "نام"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "نزدیک‌ترین"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "مبلغ را مشخص کنید"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 74572608d..d3be983e5 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index e606997d5..0998f92b9 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Pangalan"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Pangalan: mula A hanggang Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Pangalan: mula Z hanggang A"; - /* Nearby */ "Nearby" = "Sa malapit"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Inayos ayon sa pangalan"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Pag-uuri: A hanggang Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Pag-uuri: Z hanggang A"; - /* No comment provided by engineer. */ "Specify Amount" = "Tukuyin ang halaga"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 4dc974141..fbcdff578 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Nom"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Nom : de A à Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Nom : de Z à A"; - /* Nearby */ "Nearby" = "À proximité"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Trié par nom"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Tri : A à Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Tri : Z à A"; - /* No comment provided by engineer. */ "Specify Amount" = "Indiquez le montant"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index e5b6e91d2..aa811336a 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 1f256f921..34d5bdd70 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index e32c0363d..1fd89c34c 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Nama"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Nama: dari A ke Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Nama: dari Z ke A"; - /* Nearby */ "Nearby" = "Terdekat"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Diurutkan berdasarkan nama"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Menyortir: A sampai Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Menyortir: Z sampai A"; - /* No comment provided by engineer. */ "Specify Amount" = "Tentukan Jumlah"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 60ac615db..842e1e074 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Nome"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Nomi: dalla A alla Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Nomi dalla Z alla A"; - /* Nearby */ "Nearby" = "Qui vicino"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Ordinati per nome"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Ordinamento: dalla A alla Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Ordinamento: dalla Z alla A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specifica Importo"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 2775d187b..11b0b13b9 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "名前"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "名前: A～Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "名前: Z～A"; - /* Nearby */ "Nearby" = "周辺環境"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "名前順で並べ替え"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "並べ替え: A～Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "並べ替え: Z～A"; - /* No comment provided by engineer. */ "Specify Amount" = "金額を指定する"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 7bfe378ed..ebf0b0d56 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "이름"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "이름: A에서 Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "이름: Z에서 A"; - /* Nearby */ "Nearby" = "근처"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "이름으로 정렬"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "정렬: A에서 Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "정렬: Z에서 A"; - /* No comment provided by engineer. */ "Specify Amount" = "금액 특정하기"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 62f9bd43f..54cda89c5 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index b47fc2854..d5b382d5b 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index a1e4f3316..2ebd28ad3 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 6daab8f4c..7d97a7bd6 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Naam"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Naam: A tot Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Naam: Z tot A"; - /* Nearby */ "Nearby" = "Dichtbij"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Gesorteerd op naam"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Gesorteerd: A tot Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Gesorteerd: Z tot A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specificeer bedrag"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 68c7f9e2c..9a53b9b57 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Imię"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Nazwa: od A do Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Nazwa: od Z do A"; - /* Nearby */ "Nearby" = "W pobliżu"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sortuj wg nazwy"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sortuj: A do Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sortuj: Z do A"; - /* No comment provided by engineer. */ "Specify Amount" = "Określ Kwotę"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 358fbcb70..277cbc4a9 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Nome"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Nome: de A a Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Nome: de Z a A"; - /* Nearby */ "Nearby" = "Próximo"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Ordenado por nome"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Ordenando: de A a Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Ordenando: de Z a A"; - /* No comment provided by engineer. */ "Specify Amount" = "Especificar Valor"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 7ce03908d..7b10b96c3 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index f56ffadd0..3fdfee58e 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Имя"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Название: от А до Я"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Название: от Я до А"; - /* Nearby */ "Nearby" = "Рядом"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Сортировать по названию"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Сортировать: от А до Я"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Сортировать: от Я до А"; - /* No comment provided by engineer. */ "Specify Amount" = "Введите сумму"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 63006ac44..5c3309528 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Meno"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Názov: od A po Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Názov: from Z to A"; - /* Nearby */ "Nearby" = "V blízkosti"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Zoradené podľa názvu"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Radenie: od A po Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Radenie: od Z po A"; - /* No comment provided by engineer. */ "Specify Amount" = "Zadať množstvo"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 44156d1df..92a819d47 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 107957369..4a36ef8cd 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 68bdb8d4c..0b0f367b8 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 76c3f14d0..8085f5d0f 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index d06515d6e..7f145b7dc 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index ab76ad2f4..fde8568ed 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "ชื่อ"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "ชื่อ: จาก A ถึง Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "ชื่อ: จาก Z ถึง A"; - /* Nearby */ "Nearby" = "ใกล้เคียง"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "จัดเรียงตามชื่อ"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "การเรียงลำดับ: A ถึง Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "การเรียงลำดับ: Z ถึง A"; - /* No comment provided by engineer. */ "Specify Amount" = "ระบุจำนวน"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index b5b99a34f..467a536e3 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "İsim"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "İsim: A'dan Z'ye"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "İsim: Z'den A'ya"; - /* Nearby */ "Nearby" = "Yakında"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "İsme göre sıralanmış"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sıralama: A'dan Z'ye"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sıralama: Z'den A'ya"; - /* No comment provided by engineer. */ "Specify Amount" = "Tutarı Belirleyin"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index ee6053274..b8efe13fd 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Назва"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Назва: від А до Я"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Назва: від Я до А"; - /* Nearby */ "Nearby" = "Поруч"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Відсортовано за назвою"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Сортуєтся: від А до Я"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Сортуєтся: від Я до А"; - /* No comment provided by engineer. */ "Specify Amount" = "Вкажіть суму"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 98f518757..b0956434f 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Tên"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Xác định số lượng"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index e433e146d..6d5220e55 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 8fb44e845..3184005fa 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "Name"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "Name: from A to Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "Name: from Z to A"; - /* Nearby */ "Nearby" = "Nearby"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "Sorted by name"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "Sorting: A to Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "Sorting: Z to A"; - /* No comment provided by engineer. */ "Specify Amount" = "Specify Amount"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index f42d4adb5..9ffbea0ed 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "名称"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "名称: 从 A 到 Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "名称: 从 Z 到 A"; - /* Nearby */ "Nearby" = "附近的"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "以名称排序"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "分类: A 到 Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "分类: Z 到 A"; - /* No comment provided by engineer. */ "Specify Amount" = "指定数额"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index c00efa41c..b8f616693 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -1340,12 +1340,6 @@ /* No comment provided by engineer. */ "Name" = "名稱"; -/* Explore Dash: Filters */ -"Name: from A to Z" = "名稱: 從 A 到 Z"; - -/* Explore Dash: Filters */ -"Name: from Z to A" = "名稱: 從 Z 到 A"; - /* Nearby */ "Nearby" = "附近的"; @@ -2013,12 +2007,6 @@ /* Explore Dash/Filters */ "Sorted by name" = "按名稱排序"; -/* Explore Dash/Filters */ -"Sorting: A to Z" = "排序: A 到 Z"; - -/* Explore Dash/Filters */ -"Sorting: Z to A" = "排序: Z 到 A"; - /* No comment provided by engineer. */ "Specify Amount" = "指定金額"; From 2b8e04a9e564566d928401e004a421da541bd0b5 Mon Sep 17 00:00:00 2001 From: Andrei Ashikhmin Date: Sat, 20 Jan 2024 16:10:35 +0700 Subject: [PATCH 2/4] fix: refresh filters after location permission is changed --- .../List/ExplorePointOfUseListViewController.swift | 4 +++- .../Filters/PointOfUseListFiltersViewController.swift | 10 ++++++++++ .../List/MerchantListViewController.swift | 9 ++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/ExplorePointOfUseListViewController.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/ExplorePointOfUseListViewController.swift index 74461c6c5..8fff0a71f 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/ExplorePointOfUseListViewController.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/ExplorePointOfUseListViewController.swift @@ -394,7 +394,9 @@ extension ExplorePointOfUseListViewController { extension ExplorePointOfUseListViewController { private func showFilters() { let vc = PointOfUseListFiltersViewController.controller() - vc.filtersToUse = currentSegment.filterGroups + vc.filtersToUse = currentSegment.filterGroups.filter { filter in + DWLocationManager.shared.currentLocation != nil || (filter != .sortByDistanceOrName && filter != .radius) + } vc.territoriesDataSource = currentSegment.territoriesDataSource vc.delegate = self vc.defaultFilters = model.initialFilters diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/PointOfUseListFiltersViewController.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/PointOfUseListFiltersViewController.swift index bf54da6ed..b103a1335 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/PointOfUseListFiltersViewController.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/PointOfUseListFiltersViewController.swift @@ -185,6 +185,11 @@ class PointOfUseListFiltersViewController: UIViewController { configureHierarchy() configureDataSource() reloadDataSource() + + NotificationCenter.default.addObserver(self, + selector: #selector(enteredBackround), + name: UIApplication.didEnterBackgroundNotification, + object: nil) } class func controller() -> PointOfUseListFiltersViewController { @@ -192,6 +197,11 @@ class PointOfUseListFiltersViewController: UIViewController { return storyboard .instantiateViewController(withIdentifier: "PointOfUseListFiltersViewController") as! PointOfUseListFiltersViewController } + + @objc + func enteredBackround() { + dismiss(animated: false) + } } // MARK: UITableViewDelegate diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/MerchantListViewController.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/MerchantListViewController.swift index 333cf485a..f6b16904f 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/MerchantListViewController.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/MerchantListViewController.swift @@ -52,6 +52,7 @@ enum MerchantsListSegment: Int { showMap = false dataProvider = OnlineMerchantsDataProvider() showsFilters = false + case .nearby: showLocationServiceSettings = true showReversedLocation = true @@ -65,9 +66,7 @@ enum MerchantsListSegment: Int { dataProvider = AllMerchantsDataProvider() } - return .init(tag: rawValue, title: title, showMap: showMap, showLocationServiceSettings: showLocationServiceSettings, - showReversedLocation: showReversedLocation, dataProvider: dataProvider, filterGroups: filterGroups, - defaultFilters: defaultFilters, territoriesDataSource: territories, showsFilters: showsFilters) + return .init(tag: rawValue, title: title, showMap: showMap, showLocationServiceSettings: showLocationServiceSettings, showReversedLocation: showReversedLocation, dataProvider: dataProvider, filterGroups: filterGroups, defaultFilters: defaultFilters, territoriesDataSource: territories, showsFilters: showsFilters) } } @@ -88,9 +87,9 @@ extension MerchantsListSegment { case .online: return [] case .nearby: - return [.sortByDistanceOrName, .radius] + return [.sortByDistanceOrName, .radius, .locationService] case .all: - return [.sortByDistanceOrName, .territory, .radius] + return [.sortByDistanceOrName, .territory, .radius, .locationService] } } From fdfb32946c582e1439594a03a689ca2f7dd89577 Mon Sep 17 00:00:00 2001 From: Andrei Ashikhmin Date: Sat, 20 Jan 2024 16:13:33 +0700 Subject: [PATCH 3/4] chore: bump version --- DashWallet.xcodeproj/project.pbxproj | 56 ++++++++++++++-------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index d9787d791..acc889f7a 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 53; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -10061,7 +10061,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; @@ -10090,7 +10090,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -10169,6 +10169,7 @@ "\"UIKit\"", "-weak_framework", "\"WebKit\"", + "-ld64", ); PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -10190,7 +10191,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -10228,7 +10229,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -10307,6 +10308,7 @@ "\"UIKit\"", "-weak_framework", "\"WebKit\"", + "-ld64", ); PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -10395,13 +10397,12 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 1; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -10418,13 +10419,12 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 1; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -10439,7 +10439,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = C98AA93FF5283EC6405BCE4B /* Pods-WatchApp Extension.debug.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -10449,7 +10449,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -10466,7 +10466,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = CE02413EF0C60B1D1EDE6457 /* Pods-WatchApp Extension.release.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -10476,7 +10476,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -11178,7 +11178,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -11216,7 +11216,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -11295,6 +11295,7 @@ "\"UIKit\"", "-weak_framework", "\"WebKit\"", + "-ld64", ); PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -11378,12 +11379,12 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -11398,7 +11399,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 556B5EBEBAEA571D74FF69A3 /* Pods-WatchApp Extension.testflight.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -11408,7 +11409,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -11497,7 +11498,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -11525,7 +11526,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -11604,6 +11605,7 @@ "\"UIKit\"", "-weak_framework", "\"WebKit\"", + "-ld64", ); PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -11685,12 +11687,12 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -11705,7 +11707,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 29B232FD70BA2EDF87F86A56 /* Pods-WatchApp Extension.testnet.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = 44RJ69WHFF; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -11715,7 +11717,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 8.0.0; + MARKETING_VERSION = 8.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; From 819bd8850e0b6e54f80c59c0b1f9bd58eb54c99d Mon Sep 17 00:00:00 2001 From: Andrei Ashikhmin Date: Sat, 20 Jan 2024 16:28:05 +0700 Subject: [PATCH 4/4] fix: remove gift cards from filter description --- .../List/Filters/Model/PointOfUseListFiltersModel.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/Model/PointOfUseListFiltersModel.swift b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/Model/PointOfUseListFiltersModel.swift index 9aebd0058..035e2efcc 100644 --- a/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/Model/PointOfUseListFiltersModel.swift +++ b/DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/Model/PointOfUseListFiltersModel.swift @@ -109,9 +109,9 @@ struct PointOfUseListFilters: Equatable { string.append(stringValue) } - if let value = merchantPaymentTypes { - string += value.map { $0.filterLocalizedString } - } +// if let value = merchantPaymentTypes { TODO: gift cards are temporary disabled, not showing filters +// string += value.map { $0.filterLocalizedString } +// } if let value = territory { string.append(value)