MOB-386 Fix Subaccount transfer for France (#121)

* Add logging

* Fix formatting issue when locale is set to France

* Updated formatter and add UTs

* Revert rounded

* Address review comment

* Clean up

* Cleanup

* Cleanup

* Fix typo

* Fix typo and lint

Author: ruixhuang

dydx/dydxFormatter/dydxFormatter/dydxFormatter.swift

@@ -369,12 +369,12 @@ public final class dydxFormatter: NSObject, SingletonProtocol {
     /*
      xxxxxx,yyyyy or xxxxx.yyyyy
      */
-    public func raw(number: NSNumber?, size: String?) -> String? {
+    public func raw(number: NSNumber?, size: String?, locale: Locale = Locale.current) -> String? {
         if let number = number {
             let size = size ?? "0.01"
             let digits = digits(size: size)
             let rounded = rounded(number: number, digits: digits)
-            return raw(number: rounded, digits: digits)
+            return raw(number: rounded, digits: digits, locale: locale)
         } else {
             return nil
         }
@@ -383,21 +383,37 @@ public final class dydxFormatter: NSObject, SingletonProtocol {
     /*
      xxxxx.yyyyy
      */
-    public func decimalRaw(number: NSNumber?, size: String?) -> String? {
-        return raw(number: number, size: size)?.replacingOccurrences(of: ",", with: ".")
+    public func decimalLocaleAgnostic(number: NSNumber?, size: String?) -> String? {
+        raw(number: number, size: size, locale: Locale(identifier: "en-US"))
+    }
+
+    /*
+     xxxxx.yyyyy
+     */
+    public func decimalLocaleAgnostic(number: NSNumber?, digits: Int) -> String? {
+        raw(number: number, digits: digits, locale: Locale(identifier: "en-US"))
     }
 
     /*
      xxxxxx,yyyyy or xxxxx.yyyyy
      */
-    public func raw(number: NSNumber?, digits: Int) -> String? {
+    public func raw(number: NSNumber?, digits: Int, locale: Locale = Locale.current) -> String? {
         if let value = number?.doubleValue {
             if value.isFinite {
                 if let number = number {
+                    rawFormatter.locale = locale
                     rawFormatter.minimumFractionDigits = max(digits, 0)
                     rawFormatter.maximumFractionDigits = max(digits, 0)
                     rawFormatter.roundingMode = .halfUp
-                    return rawFormatter.string(from: number)
+
+                    let formatted = rawFormatter.string(from: number)
+
+                    // need to special case for negative 0, see dydxFormatter tests. E.g. "-$0.001" should go to "$0.00"
+                    if let formatted = formatted, rawFormatter.number(from: formatted) == 0 {
+                        return rawFormatter.string(from: 0)
+                    } else {
+                        return formatted
+                    }
                 } else {
                     return nil
                 }

dydx/dydxFormatter/dydxFormatterTests/dydxFormatterTests.swift

@@ -18,6 +18,54 @@ final class dydxFormatterTests: XCTestCase {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
 
+    func testDecimalLocaleAgnostic() {
+        struct TestCase {
+            let number: NSNumber
+            let digits: Int
+            let expected: String
+        }
+
+        let testCases: [TestCase] = [
+            .init(number: 1, digits: 2, expected: "1.00"),
+            .init(number: -0.001, digits: 0, expected: "0"),
+            .init(number: -0.001, digits: 3, expected: "-0.001"),
+            .init(number: -0.001, digits: 2, expected: "0.00"),
+            .init(number: 0.001, digits: 2, expected: "0.00"),
+            .init(number: -0.005, digits: 2, expected: "-0.01"),
+            .init(number: -0.0051, digits: 2, expected: "-0.01")
+        ]
+
+        for testCase in testCases {
+            let formatted = dydxFormatter.shared.decimalLocaleAgnostic(number: testCase.number, digits: testCase.digits)
+            XCTAssertEqual(formatted, testCase.expected, "Test case: \(testCase)")
+        }
+    }
+
+    func testRaw() {
+        struct TestCase {
+            let number: NSNumber
+            let digits: Int
+            let expected: String
+            var locale: Locale = Locale(identifier: "en_US")
+        }
+
+        let testCases: [TestCase] = [
+            .init(number: 1, digits: 2, expected: "1.00"),
+            .init(number: -0.001, digits: 0, expected: "0"),
+            .init(number: -0.001, digits: 3, expected: "-0.001"),
+            .init(number: -0.001, digits: 2, expected: "0.00"),
+            .init(number: 0.001, digits: 2, expected: "0.00"),
+            .init(number: -0.005, digits: 2, expected: "-0.01"),
+            .init(number: -0.0051, digits: 2, expected: "-0.01"),
+            .init(number: 1123345.123, digits: 2, expected: "1123345,12", locale: Locale(identifier: "fr_FR"))
+        ]
+
+        for testCase in testCases {
+            let formatted = dydxFormatter.shared.raw(number: testCase.number, digits: testCase.digits, locale: testCase.locale)
+            XCTAssertEqual(formatted, testCase.expected, "Test case: \(testCase)")
+        }
+    }
+
     func testDollarFormatting() throws {
         struct TestCase {
             let number: Double

dydx/dydxPresenters/dydxPresenters/_v4/GlobalWorkers/Workers/dydxTransferSubaccountWorker.swift

@@ -40,8 +40,8 @@ final class dydxTransferSubaccountWorker: BaseWorker {
                     subaccountNumber = 0
                 }
                 let depositAmount = (balance ?? 0) - dydxTransferSubaccountWorker.balanceRetainAmount
-                let amountString = dydxFormatter.shared.raw(number: NSNumber(value: depositAmount),
-                                                            digits: dydxTokenConstants.usdcTokenDecimal)
+                let amountString = dydxFormatter.shared.decimalLocaleAgnostic(number: NSNumber(value: depositAmount),
+                                                                              digits: dydxTokenConstants.usdcTokenDecimal)
                 if let amountString = amountString {
                     self?.depositToSubaccount(amount: amountString,
                                               subaccount: subaccountNumber,
@@ -55,7 +55,7 @@ final class dydxTransferSubaccountWorker: BaseWorker {
 
     private func depositToSubaccount(amount: String, subaccount: Int, walletState: dydxWalletState) {
         CosmoJavascript.shared.depositToSubaccount(subaccount: subaccount, amount: amount) { result in
-            let trackingData = [
+            var trackingData = [
                 "amount": "\(amount)",
                 "address": "\(String(describing: walletState.currentWallet?.cosmoAddress))"
             ]
@@ -65,6 +65,9 @@ final class dydxTransferSubaccountWorker: BaseWorker {
                 Tracking.shared?.log(event: "SubaccountDeposit", data: trackingData)
             } else {
                 Console.shared.log("Deposit to subaccount failed")
+                if let resultString = result as? String {
+                    trackingData["error"] = resultString
+                }
                 Tracking.shared?.log(event: "SubaccountDeposit_Failed", data: trackingData)
             }
         }