Merge pull request #108 from OpenZesame/updating_version

Release candidat 1.0.2
OpenZesame · Jun 21, 2019 · 01c9e13 · 01c9e13
2 parents 6d4ce27 + 6685d3d
commit 01c9e13
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 219 deletions.
diff --git a/Podfile b/Podfile
@@ -4,7 +4,7 @@ use_modular_headers!
 
 def shared
   # The Zilliqa Swift SDK
-  pod 'Zesame', :git => 'https://github.com/OpenZesame/Zesame.git', :branch => 'decimal_amount'
+  pod 'Zesame', '~> 1.0.1'
 
   # Used for Crash reporting
   pod 'Firebase/Core'

diff --git a/Podfile.lock b/Podfile.lock
@@ -87,7 +87,7 @@ PODS:
   - SwiftyBeaver (1.6.2)
   - TinyConstraints (3.3.1)
   - Validator (3.1.1)
-  - Zesame (1.0.0):
+  - Zesame (1.0.1):
     - Alamofire (~> 5.0.0-beta.4)
     - BigInt (~> 4.0.0)
     - CryptoSwift (~> 1.0.0)
@@ -116,7 +116,7 @@ DEPENDENCIES:
   - SwiftyBeaver
   - TinyConstraints
   - Validator
-  - Zesame (from `https://github.com/OpenZesame/Zesame.git`, branch `decimal_amount`)
+  - Zesame (~> 1.0.1)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -154,16 +154,7 @@ SPEC REPOS:
     - SwiftyBeaver
     - TinyConstraints
     - Validator
-
-EXTERNAL SOURCES:
-  Zesame:
-    :branch: decimal_amount
-    :git: https://github.com/OpenZesame/Zesame.git
-
-CHECKOUT OPTIONS:
-  Zesame:
-    :commit: 8da70b2c224da9d186867cf462078b5603f1d21c
-    :git: https://github.com/OpenZesame/Zesame.git
+    - Zesame
 
 SPEC CHECKSUMS:
   Alamofire: cd08a4402bd12cacd0c66f23fb12fec8d6b965e4
@@ -200,8 +191,8 @@ SPEC CHECKSUMS:
   SwiftyBeaver: 8e67ab3cd94389cbbb7a9c7cc02748d98bfee68e
   TinyConstraints: dbf7519aefc01ea59d62244300c7718aec68e280
   Validator: b34ab17a8fffd0c1ffd8f9002ead4d1e02cd9e6e
-  Zesame: c7bbd6548ef648af5480338f37a94bd4fe0bc4e3
+  Zesame: 33728cc171403a8f48c08985ce8375bae9d8faba
 
-PODFILE CHECKSUM: 1fe225be0adb22d399a61c5e12f3713681222bb3
+PODFILE CHECKSUM: c1b20b1e99cdedab5a61d43b103b44a947a887ec
 
 COCOAPODS: 1.6.1
diff --git a/Pods/Local Podspecs/BigInt.podspec.json b/Pods/Local Podspecs/BigInt.podspec.json
diff --git a/Pods/Local Podspecs/CryptoSwift.podspec.json b/Pods/Local Podspecs/CryptoSwift.podspec.json
diff --git a/Pods/Local Podspecs/Zesame.podspec.json b/Pods/Local Podspecs/Zesame.podspec.json
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Zesame/Source/Models/Manual/Payment/Payment.swift b/Pods/Zesame/Source/Models/Manual/Payment/Payment.swift
diff --git a/Source/Application/AppCoordinator.swift b/Source/Application/AppCoordinator.swift
@@ -160,9 +160,7 @@ extension AppCoordinator {
 private extension AppCoordinator {
 
     func lockApp() {
-        print("🔐 Trying to lock app")
         if isCurrentlyPresentingUnLockScene || isCurrentlyPresentingLockScene {
-            print("🙅🏻‍♀️ Avoided locking app 🔒")
             return
         }
         deepLinkHandler.appIsLockedBufferDeeplinks()
@@ -172,7 +170,6 @@ private extension AppCoordinator {
     func unlockApp() {
         if isCurrentlyPresentingUnLockScene { return }
         guard isCurrentlyPresentingLockScene else { return }
-        print("🔓 Trying to unlock app")
         if hasConfiguredPincode {
             toUnlockAppWithPincodeIfNeeded()
         } else {

diff --git a/Source/Application/InputValidators/Validators/AmountValidator.swift b/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?
         }
     }
 }
diff --git a/Source/Application/Zhip-Info.plist b/Source/Application/Zhip-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
 	<string>15</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/Source/Scenes/1_Main/2_Main/0_Main/Main.swift b/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 {}
diff --git a/Source/Scenes/1_Main/2_Main/B_Receive/Receive/ReceiveView.swift b/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
         ]

diff --git a/Tests/Tests/CharacterSetTests.swift b/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