cleaning up

Author: Sajjon

Source/Application/InputValidators/Validators/AmountValidator.swift

@@ -88,8 +88,7 @@ enum AmountError<ConvertTo: ExpressibleByAmount>: Swift.Error, InputError {
         case .tooLarge(let max, let unit): return €.tooLarge("\(max.thousands) \(unit.name)")
         case .tooSmall(let min, let unit): return €.tooSmall("\(min.thousands) \(unit.name)")
         case .nonNumericString: return €.nonNumericString
-        case .other(let anyError):
-            return €.nonNumericString // TODO which error message to display?
+        case .other: return €.nonNumericString // TODO which error message to display?
         }
     }
 }

Source/Scenes/1_Main/2_Main/0_Main/Main.swift

@@ -35,8 +35,3 @@ extension Main: NavigationBarLayoutOwner {
         return .transluscent
     }
 }
-
-
-
-//final class AppLocked: Scene<AppLockedView> {}
-//final class AppLockedView: UIView {}

Source/Scenes/1_Main/2_Main/B_Receive/Receive/ReceiveView.swift

@@ -61,7 +61,6 @@ extension ReceiveView: ViewModelled {
         return [
             viewModel.receivingAddress              --> addressValueTextView.rx.text,
             viewModel.amountPlaceholder             --> requestingAmountField.rx.placeholder,
-//            viewModel.amount                        --> requestingAmountField.rx.text,
             viewModel.amountValidation              --> requestingAmountField.rx.validation,
             viewModel.qrImage                       --> qrImageView.rx.image
         ]

Tests/Tests/CharacterSetTests.swift

@@ -46,85 +46,14 @@ class CharacterSetTests: XCTestCase {
 
     }
 
-    private func doTest(_ amountString: String, expected: Double) {
-        
-        func doubleFromAnyLocale(numberString: String) -> Double? {
-            func tryLocale(locale: Locale) -> Double? {
-                let formatter = NumberFormatter()
-                formatter.locale = locale
-                return formatter.number(from: amountString)?.doubleValue
-            }
-            
-            for localeIdentifier in Locale.availableIdentifiers {
-                let locale = Locale(identifier: localeIdentifier)
-                if let double = tryLocale(locale: locale) {
-                    print("Successfully created number from locale with id: \(localeIdentifier)")
-                    return double
-                } else {
-                    print("Failed to create number from locale with id: \(localeIdentifier)")
-                }
-            }
-            return nil
-        }
-        guard let number = doubleFromAnyLocale(numberString: amountString) else {
-            return XCTFail("failed to get number from: `\(amountString)`")
-        }
-        XCTAssertEqual(number, expected)
-    }
-  
-    func testFo() {
-        doTest("0,1", expected: 0.1)
-        doTest("0.1", expected: 0.1)
-    }
-    
-    func testZilAmountFromDecimalStringWithDot() {
-        XCTAssertNotNil(Double("0.01"))
-//        XCTAssertNoThrow(try ZilAmount.init(zil: "0.01"))
-    }
-    
     func testZilAmountFromDecimalStringWithComma() {
-        XCTAssertNotNil(Double("0,01"))
-//        XCTAssertNoThrow(try ZilAmount.init(zil: "0,01"))
+        XCTAssertNotNil(Double("0\(decSep)01"))
     }
 
-    
-    func testCurrntLocaleIsSweden() {
-        XCTAssertEqual(Locale.current.identifier, "en_US")
-    }
-    
-    func testAmountFromStringLocale() {
-        XCTAssertEqual(Locale.current.identifier, "en_US")
-        XCTAssertNotNil(Locale(identifier: "sv_SE"))
-        
-//        let languages = ["bs", "zh-Hant", "en", "fi", "ko", "lv", "ms", "pl", "pt-BR", "ru", "sr-Latn", "sk", "es", "tr"]
-//        UserDefaults.standard.set([languages[0]], forKey: "AppleLanguages")
-        
-        func assertLanguages(equal: [String]) {
-            if let anyLang = UserDefaults.standard.value(forKey: .languagesKey) {
-                if let languages = anyLang as? [String] {
-                    XCTAssertEqual(languages.count, equal.count)
-                    XCTAssertEqual(languages, equal)
-                    
-                } else {
-                    XCTFail("not a string array")
-                }
-            } else {
-                XCTFail("nu value for key `AppleLanguages`")
-            }
-        }
-        
-        assertLanguages(equal: ["en-SE"])
-//        UserDefaults.standard.set(["en-SE"], forKey: .languagesKey)
-//        assertLanguages(equal: ["sv-SE"])
-//        XCTAssertEqual(Locale.current.identifier, "sv-SE")
-        
-//        let swedish = Locale(identifier: "sv_SE")
-//        Locale.current = swedish
-        
-//        try Amount(zil: amountString)
-    }
 }
 
 private extension String {
     static let languagesKey = "AppleLanguages"
 }
+
+private let decSep = Locale.current.decimalSeparatorForSure