chore: Merge pull request #519 from dashpay/develop

chore: Merge develop into master

.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/Sources/Application/Tools.swift

@@ -17,6 +17,8 @@
 
 import Foundation
 
+private var _cachedFormatters: [String: NumberFormatter] = [:]
+
 private var _decimalFormatter: NumberFormatter!
 private var _fiatFormatter: NumberFormatter!
 private var _dashFormatter: NumberFormatter = {
@@ -93,6 +95,10 @@ extension NumberFormatter {
     }
 
     static func cryptoFormatter(currencyCode: String, exponent: Int) -> NumberFormatter {
+        if let formatter = _cachedFormatters[currencyCode] {
+            return formatter
+        }
+
         let formatter = NumberFormatter()
         formatter.isLenient = true
         formatter.numberStyle = .currency
@@ -109,16 +115,23 @@ extension NumberFormatter {
 
         formatter.maximumFractionDigits = exponent
         formatter.minimumFractionDigits = 0
+        _cachedFormatters[currencyCode] = formatter
 
         return formatter
     }
 
     static func fiatFormatter(currencyCode: String) -> NumberFormatter {
+        if let formatter = _cachedFormatters[currencyCode] {
+            return formatter
+        }
+
         let formatter = NumberFormatter()
         formatter.isLenient = true
         formatter.numberStyle = .currency
         formatter.generatesDecimalNumbers = true
         formatter.currencyCode = currencyCode
+        _cachedFormatters[currencyCode] = formatter
+
         return formatter
     }
 }

DashWallet/Sources/Categories/DSTransaction+DashWallet.h

@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (readonly) NSData *txHashData;
 @property (readonly) NSString *txHashHexString;
+@property (readonly) NSDate *date;
 
 + (uint64_t)txMinOutputAmount;
 

DashWallet/Sources/Categories/DSTransaction+DashWallet.m

@@ -20,6 +20,15 @@
 
 @implementation DSTransaction (DashWallet)
 
+- (NSDate *)date {
+    DSChain *chain = self.chain;
+    NSTimeInterval now = [chain timestampForBlockHeight:TX_UNCONFIRMED];
+    NSTimeInterval txTime = (self.timestamp > 1) ? self.timestamp : now;
+    NSDate *txDate = [NSDate dateWithTimeIntervalSince1970:txTime];
+
+    return txDate;
+}
+
 - (NSData *)txHashData {
     return [NSData dataWithBytes:self.txHash.u8 length:sizeof(UInt256)];
 }

DashWallet/Sources/Categories/Numbers+Dash.swift

@@ -62,6 +62,10 @@ extension Decimal {
         rounded(sign == .minus ? .up : .down)
     }
 
+    var fractionDigits: Int {
+        max(-exponent, 0)
+    }
+
     /// Converts `Decimal` to plain dash amount in duffs
     ///
     /// - Returns: Plain dash amount in duffs

DashWallet/Sources/Categories/String+DashWallet.swift

@@ -116,7 +116,6 @@ extension String {
         }
 
         let isCurrencySymbolAtTheBeginning = currencySymbolRange.lowerBound == format.startIndex
-        let isCurrencySymbolAtTheEnd = currencySymbolRange.upperBound == format.endIndex
 
         // special case to deal with RTL languages
         if format.hasPrefix("\u{0000200e}") || format.hasPrefix("\u{0000200f}") {

DashWallet/Sources/Infrastructure/Currency Exchanger/CurrencyExchanger.swift

@@ -67,6 +67,12 @@ public final class CurrencyExchanger {
         if amount.isZero { return 0 }
 
         let rate = try rate(for: currency)
+        return try convertDash(amount: amount, to: currency, rate: rate)
+    }
+
+    public func convertDash(amount: Decimal, to currency: String, rate: Decimal) throws -> Decimal {
+        if amount.isZero { return 0 }
+
         let result = rate*amount
 
         let formatter = NumberFormatter.fiatFormatter(currencyCode: currency)
@@ -83,22 +89,28 @@ public final class CurrencyExchanger {
         if amount.isZero { return 0 }
 
         let rate = try rate(for: currency)
+        return try convertToDash(amount: amount, currency: currency, rate: rate)
+    }
+
+    public func convertToDash(amount: Decimal, currency: String, rate: Decimal) throws -> Decimal {
+        if amount.isZero { return 0 }
+
         return amount/rate
     }
 
     public func convert(to currency: String, amount: Decimal, amountCurrency: String) throws -> Decimal {
         if amount.isZero { return 0 }
 
         if amountCurrency == kDashCurrency {
-            let rate = try rate(for: currency)
-            return amount/rate
+            return try convertToDash(amount: amount, currency: currency)
         }
 
         let dashAmount = try convertToDash(amount: amount, currency: amountCurrency)
         let result = try convertDash(amount: dashAmount, to: currency)
         return result
     }
 
+
     static let shared = CurrencyExchanger(dataProvider: RatesProviderFactory.base)
 }
 

DashWallet/Sources/Infrastructure/Database/Migrations.bundle/20230208142504_update_tx_userinfo_table.sql

@@ -0,0 +1,3 @@
+CREATE TABLE backup_tx_userinfo AS SELECT * FROM tx_userinfo;
+ALTER TABLE tx_userinfo ADD rate INT NULL;
+ALTER TABLE tx_userinfo ADD rateCurrencyCode VARCHAR(3) NULL;

DashWallet/Sources/Infrastructure/Database/Migrations.bundle/20230212103028_add_rate_fraction_digits_into_userinfo_table.sql

@@ -0,0 +1 @@
+ALTER TABLE tx_userinfo ADD rateMaximumFractionDigits INT NULL;

DashWallet/Sources/Models/Coinbase/Coinbase.swift

@@ -61,10 +61,13 @@ class Coinbase {
         paymentMethodsService = PaymentMethods(authInterop: auth)
         currencyExchanger.startExchangeRateFetching()
 
-        // Pre-fetch data
+        prefetchData()
+    }
+
+    private func prefetchData() {
         Task {
             try await accountService.refreshAccount(kDashAccount)
-            try await paymentMethodsService.fetchPaymentMethods()
+            _ = try await paymentMethodsService.fetchPaymentMethods()
         }
     }