chore: Merge pull request #512 from dashpay/release/6.2.1

.tx/config

@@ -1,37 +1,38 @@
 [main]
 host = https://www.transifex.com
 
-[dash-mobile-wallets.app-localizable-strings]
-file_filter = DashWallet/<lang>.lproj/Localizable.strings
+[o:dash:p:dash-mobile-wallets:r:app-localizable-strings]
+file_filter  = DashWallet/<lang>.lproj/Localizable.strings
+source_file  = DashWallet/en.lproj/Localizable.strings
+source_lang  = en
+type         = STRINGS
 minimum_perc = 0
-source_file = DashWallet/en.lproj/Localizable.strings
-source_lang = en
-type = STRINGS
 
-[dash-mobile-wallets.app-localizable-strings-dict]
-file_filter = DashWallet/<lang>.lproj/Localizable.stringsdict
+[o:dash:p:dash-mobile-wallets:r:app-localizable-strings-dict]
+file_filter  = DashWallet/<lang>.lproj/Localizable.stringsdict
+source_file  = DashWallet/en.lproj/Localizable.stringsdict
+source_lang  = en
+type         = STRINGSDICT
 minimum_perc = 0
-source_file = DashWallet/en.lproj/Localizable.stringsdict
-source_lang = en
-type = STRINGSDICT
 
-[dash-mobile-wallets.watch-interface-strings]
-file_filter = WatchApp/<lang>.lproj/Interface.strings
+[o:dash:p:dash-mobile-wallets:r:appstore-description]
+file_filter  = fastlane/metadata/<lang>/description.txt
+source_file  = fastlane/metadata/en-US/description.txt
+source_lang  = en
+type         = TXT
 minimum_perc = 0
-source_file = WatchApp/en.lproj/Interface.strings
-source_lang = en
-type = STRINGS
 
-[dash-mobile-wallets.appstore-description]
-file_filter = fastlane/metadata/<lang>/description.txt
+[o:dash:p:dash-mobile-wallets:r:appstore-release_notes]
+file_filter  = fastlane/metadata/<lang>/release_notes.txt
+source_file  = fastlane/metadata/en-US/release_notes.txt
+source_lang  = en
+type         = TXT
 minimum_perc = 0
-source_file = fastlane/metadata/en-US/description.txt
-source_lang = en
-type = TXT
 
-[dash-mobile-wallets.appstore-release_notes]
-file_filter = fastlane/metadata/<lang>/release_notes.txt
+[o:dash:p:dash-mobile-wallets:r:watch-interface-strings]
+file_filter  = WatchApp/<lang>.lproj/Interface.strings
+source_file  = WatchApp/en.lproj/Interface.strings
+source_lang  = en
+type         = STRINGS
 minimum_perc = 0
-source_file = fastlane/metadata/en-US/release_notes.txt
-source_lang = en
-type = TXT
+

DashWallet.xcodeproj/project.pbxproj

@@ -6960,7 +6960,7 @@
 				CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
 				CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
 				CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
@@ -7009,7 +7009,7 @@
 				CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
 				CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
 				CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -7124,7 +7124,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
 				IBSC_MODULE = WatchApp_Extension;
@@ -7146,7 +7146,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
 				IBSC_MODULE = WatchApp_Extension;
@@ -7166,7 +7166,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C98AA93FF5283EC6405BCE4B /* Pods-WatchApp Extension.debug.xcconfig */;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				ENABLE_BITCODE = YES;
 				EXCLUDED_ARCHS = "";
@@ -7189,7 +7189,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = CE02413EF0C60B1D1EDE6457 /* Pods-WatchApp Extension.release.xcconfig */;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				ENABLE_BITCODE = YES;
 				EXCLUDED_ARCHS = "";
@@ -7213,7 +7213,7 @@
 			baseConfigurationReference = 206554BC730E9F2BB594D044 /* Pods-TodayExtension.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = dashwallet/dashwalletTodayExtension.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
@@ -7238,7 +7238,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = dashwallet/dashwalletTodayExtension.entitlements;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
@@ -7330,7 +7330,7 @@
 				CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
 				CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
 				CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -7383,7 +7383,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = dashwallet/dashwalletTodayExtension.entitlements;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
@@ -7440,7 +7440,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
 				IBSC_MODULE = WatchApp_Extension;
@@ -7460,7 +7460,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 556B5EBEBAEA571D74FF69A3 /* Pods-WatchApp Extension.testflight.xcconfig */;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				ENABLE_BITCODE = YES;
 				EXCLUDED_ARCHS = "";
@@ -7557,7 +7557,7 @@
 				CLIENT_ID = 0c38beb67db0c68191326be347d7ec0abd7d77adb02a79db1abeba343f16a0f7;
 				CLIENT_SECRET = cc980185754f905e24250f877792817c03540b3d0e0959721df291c816797e59;
 				CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -7599,7 +7599,7 @@
 			baseConfigurationReference = 8A9877BEC5093CED81768D3D /* Pods-TodayExtension.testnet.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = dashwallet/dashwalletTodayExtension.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
@@ -7655,7 +7655,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				EXCLUDED_ARCHS = "";
 				IBSC_MODULE = WatchApp_Extension;
@@ -7675,7 +7675,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 29B232FD70BA2EDF87F86A56 /* Pods-WatchApp Extension.testnet.xcconfig */;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 44RJ69WHFF;
 				ENABLE_BITCODE = YES;
 				EXCLUDED_ARCHS = "";

DashWallet/Sources/Models/Explore Dash/Model/Entites/ExplorePointOfUse.swift

@@ -187,7 +187,10 @@ extension ExplorePointOfUse: RowDecodable {
         let address4 = row[ExplorePointOfUse.address4]
         let latitude = row[ExplorePointOfUse.latitude]
         let longitude = row[ExplorePointOfUse.longitude]
-        let website = row[ExplorePointOfUse.website]
+        var website = row[ExplorePointOfUse.website]
+        if !website.hasPrefix("http") {
+            website = "https://" + website
+        }
         let phone: String? = row[ExplorePointOfUse.phone]?.digits
         let logoLocation = row[ExplorePointOfUse.logoLocation]
         let coverImage: String? = row[ExplorePointOfUse.coverImage]

DashWallet/Sources/Models/Explore Dash/Services/ExploreDatabaseSyncManager.swift

@@ -28,7 +28,7 @@ private let timestampKey = "Data-Timestamp"
 private let checksumKey = "Data-Checksum"
 
 // TODO: Move it to plist and note in release process
-let bundleExploreDatabaseSyncTime: TimeInterval = 1675272692196/1000
+let bundleExploreDatabaseSyncTime: TimeInterval = 1676050324994/1000
 
 // MARK: - ExploreDatabaseSyncManager
 

DashWallet/Sources/UI/Coinbase/Two Factor Auth/TwoFactorAuthViewController.swift

@@ -89,7 +89,7 @@ final class TwoFactorAuthViewController: ActionButtonViewController {
     }
 
     override var actionButtonTitle: String? {
-        NSLocalizedString("Verfiy", comment: "Coinbase")
+        NSLocalizedString("Verify", comment: "Coinbase")
     }
 
     override func actionButtonAction(sender: UIView) {

DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/Details/Views/PointOfUseDetailsView.swift

@@ -116,6 +116,12 @@ class PointOfUseDetailsView: UIView {
         configureActionBlock()
         configureBottomButton()
     }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        containerView.setNeedsLayout()
+    }
 }
 
 extension PointOfUseDetailsView {
@@ -281,14 +287,26 @@ class VerticalButton: DWTintedButton {
         super.init(frame: frame)
 
         imageView?.contentMode = .scaleAspectFit;
-        layer.cornerRadius = 9
         titleLabel?.font = .dw_mediumFont(ofSize: 11)
+
+        layer.cornerRadius = 9
+        centerVertically(padding: 3)
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+    override func resetAppearance() {
+        super.resetAppearance()
+
+        imageView?.contentMode = .scaleAspectFit;
+        titleLabel?.font = .dw_mediumFont(ofSize: 11)
+
+        layer.cornerRadius = 9
+        centerVertically(padding: 3)
+    }
+
     override func awakeFromNib() {
         super.awakeFromNib()
         contentHorizontalAlignment = .left

DashWallet/Sources/UI/Payments/Amount/BaseAmountViewController.swift

@@ -214,8 +214,6 @@ extension BaseAmountViewController {
 extension BaseAmountViewController: DWLocalCurrencyViewControllerDelegate {
     func localCurrencyViewController(_ controller: DWLocalCurrencyViewController, didSelectCurrency currencyCode: String) {
         model.setupCurrencyCode(currencyCode)
-        amountView.amountInputControl.reloadData()
-        amountView.inputTypeSwitcher.reloadData()
 
         controller.dismiss(animated: true)
     }

DashWallet/Sources/UI/Payments/Amount/Model/BaseAmountModel.swift

@@ -33,7 +33,13 @@ struct AmountInputItem: Equatable {
     var isMain: Bool { currencyCode == kDashCurrency }
 
     static let dash = AmountInputItem(currencyName: kDashCurrency, currencyCode: kDashCurrency)
-    static var app: AmountInputItem { .init(currencyName: App.fiatCurrency, currencyCode: App.fiatCurrency) }
+    static var app: AmountInputItem {
+        .init(currencyName: App.fiatCurrency, currencyCode: App.fiatCurrency)
+    }
+
+    static func custom(currencyName: String, currencyCode: String) -> AmountInputItem {
+        .init(currencyName: currencyName, currencyCode: currencyCode)
+    }
 }
 
 // MARK: - BaseAmountModel
@@ -115,7 +121,7 @@ class BaseAmountModel {
 
         currentInputItem = .dash
         inputItems = [
-            .app,
+            .custom(currencyName: localCurrencyCode, currencyCode: localCurrencyCode),
             .dash,
         ]
 
@@ -161,7 +167,7 @@ class BaseAmountModel {
 
         currentInputItem = currentInputItem.currencyCode == kDashCurrency ? .dash : .app
         inputItems = [
-            .app,
+            .custom(currencyName: localCurrencyCode, currencyCode: localCurrencyCode),
             .dash,
         ]
 

DashWallet/Sources/UI/Views/SharedViews/Buttons/DWActionButton.h

@@ -29,6 +29,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)showActivityIndicator;
 - (void)hideActivityIndicator;
 
+// NOTE: Internal usage only!
+- (void)resetAppearance;
+
 @end
 
 @interface DWTintedButton : DWActionButton

DashWallet/Sources/UI/Views/SharedViews/Buttons/DWActionButton.m

@@ -50,8 +50,9 @@ - (instancetype)initWithFrame:(CGRect)frame {
 
 - (void)traitCollectionDidChange:(nullable UITraitCollection *)previousTraitCollection {
     [super traitCollectionDidChange:previousTraitCollection];
-
-    [self resetAppearance];
+    if ((self.traitCollection.verticalSizeClass != previousTraitCollection.verticalSizeClass) || (self.traitCollection.horizontalSizeClass != previousTraitCollection.horizontalSizeClass)) {
+        [self resetAppearance];
+    }
 }
 
 - (void)setUsedOnDarkBackground:(BOOL)usedOnDarkBackground {
@@ -146,6 +147,8 @@ - (void)setup_ActionButton {
 
     BOOL dark = self.usedOnDarkBackground;
     BOOL inverted = self.inverted;
+
+    self.imageEdgeInsets = UIEdgeInsetsMake(0.0, 0.0, 0.0, 14.0);
 }
 
 - (void)resetAppearance {
@@ -193,7 +196,6 @@ - (void)resetAppearance {
     [self setBorderColor:color forState:UIControlStateDisabled];
 
     self.tintColor = self.accentColor;
-    self.imageEdgeInsets = UIEdgeInsetsMake(0.0, 0.0, 0.0, 14.0);
 }
 
 #pragma mark - Styles

DashWallet/en.lproj/Localizable.strings

@@ -1523,9 +1523,6 @@
 /* No comment provided by engineer. */
 "Validating username…" = "Validating username…";
 
-/* Coinbase */
-"Verfiy" = "Verfiy";
-
 /* No comment provided by engineer. */
 "Verified Successfully" = "Verified Successfully";
 

DashWallet/sv.lproj/Localizable.strings

@@ -1523,9 +1523,6 @@
 /* No comment provided by engineer. */
 "Validating username…" = "Validating username…";
 
-/* Coinbase */
-"Verfiy" = "Verfiy";
-
 /* No comment provided by engineer. */
 "Verified Successfully" = "Verified Successfully";
 

DashWallet/zh-Hans.lproj/Localizable.strings

@@ -1523,9 +1523,6 @@
 /* No comment provided by engineer. */
 "Validating username…" = "Validating username…";
 
-/* Coinbase */
-"Verfiy" = "Verfiy";
-
 /* No comment provided by engineer. */
 "Verified Successfully" = "Verified Successfully";
 

DashWallet/zh-Hant-TW.lproj/Localizable.strings

@@ -1523,9 +1523,6 @@
 /* No comment provided by engineer. */
 "Validating username…" = "Validating username…";
 
-/* Coinbase */
-"Verfiy" = "Verfiy";
-
 /* No comment provided by engineer. */
 "Verified Successfully" = "Verified Successfully";