improve lock screen, max attemps 7, remove async loadEvents (older iP…

…hones), change sender message when tx null, 312
wagerr · Jan 16, 2020 · 5421e4b · 5421e4b
1 parent dad8233
commit 5421e4b
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 87 deletions.
diff --git a/breadwallet.xcodeproj/project.pbxproj b/breadwallet.xcodeproj/project.pbxproj
diff --git a/breadwallet.xcodeproj/xcshareddata/xcschemes/Screenshots.xcscheme b/breadwallet.xcodeproj/xcshareddata/xcschemes/Screenshots.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-               BuildableName = "Wagerr Bet.app"
+               BuildableName = "Wagerr Pro.app"
                BlueprintName = "breadwallet"
                ReferencedContainer = "container:breadwallet.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>
@@ -52,7 +52,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "75A2A7A31DA5934300A983D8"
-               BuildableName = "breadwalletTests.xctest"
+               BuildableName = "Wagerr Pro.xctest"
                BlueprintName = "breadwalletTests"
                ReferencedContainer = "container:breadwallet.xcodeproj">
             </BuildableReference>
@@ -84,7 +84,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>
@@ -101,7 +101,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>

diff --git a/breadwallet.xcodeproj/xcshareddata/xcschemes/Testnet.xcscheme b/breadwallet.xcodeproj/xcshareddata/xcschemes/Testnet.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-               BuildableName = "Wagerr Bet.app"
+               BuildableName = "Wagerr Pro.app"
                BlueprintName = "breadwallet"
                ReferencedContainer = "container:breadwallet.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>
@@ -42,7 +42,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "75A2A7A31DA5934300A983D8"
-               BuildableName = "breadwalletTests.xctest"
+               BuildableName = "Wagerr Pro.xctest"
                BlueprintName = "breadwalletTests"
                ReferencedContainer = "container:breadwallet.xcodeproj">
             </BuildableReference>
@@ -74,7 +74,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>
@@ -91,7 +91,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>

diff --git a/breadwallet.xcodeproj/xcshareddata/xcschemes/breadwallet (TestFlight).xcscheme b/breadwallet.xcodeproj/xcshareddata/xcschemes/breadwallet (TestFlight).xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-               BuildableName = "Wagerr Bet.app"
+               BuildableName = "Wagerr Pro.app"
                BlueprintName = "breadwallet"
                ReferencedContainer = "container:breadwallet.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>
@@ -42,7 +42,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "75A2A7A31DA5934300A983D8"
-               BuildableName = "breadwalletTests.xctest"
+               BuildableName = "Wagerr Pro.xctest"
                BlueprintName = "breadwalletTests"
                ReferencedContainer = "container:breadwallet.xcodeproj">
             </BuildableReference>
@@ -85,7 +85,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>
@@ -109,7 +109,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>

diff --git a/breadwallet.xcodeproj/xcshareddata/xcschemes/breadwallet.xcscheme b/breadwallet.xcodeproj/xcshareddata/xcschemes/breadwallet.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-               BuildableName = "Wagerr Bet.app"
+               BuildableName = "Wagerr Pro.app"
                BlueprintName = "breadwallet"
                ReferencedContainer = "container:breadwallet.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>
@@ -42,7 +42,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "75A2A7A31DA5934300A983D8"
-               BuildableName = "breadwalletTests.xctest"
+               BuildableName = "Wagerr Pro.xctest"
                BlueprintName = "breadwalletTests"
                ReferencedContainer = "container:breadwallet.xcodeproj">
             </BuildableReference>
@@ -84,7 +84,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>
@@ -108,7 +108,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "75A2A78F1DA5934300A983D8"
-            BuildableName = "Wagerr Bet.app"
+            BuildableName = "Wagerr Pro.app"
             BlueprintName = "breadwallet"
             ReferencedContainer = "container:breadwallet.xcodeproj">
          </BuildableReference>

diff --git a/breadwallet/EventDetailViewController.swift b/breadwallet/EventDetailViewController.swift
@@ -302,7 +302,9 @@ class EventDetailViewController: UIViewController, Subscriber, EventBetOptionDel
 
     private func reload() {
         viewModel = event
+        let currChoice = (self.dataSource as! EventDetailDataSource).currChoice
         self.dataSource = EventDetailDataSource(tableView: tableView, viewModel: viewModel, controller: self)
+        dataSource?.prepareBetLayout(choice: currChoice)
         tableView.dataSource = dataSource
         tableView.reloadData()
     }

diff --git a/breadwallet/src/Constants/Strings.swift b/breadwallet/src/Constants/Strings.swift
@@ -211,6 +211,7 @@ enum S {
         static let newVersionTitle = NSLocalizedString("BetSettings.newVersion", value: "New version", comment: "New version available")
         static let newVersion = NSLocalizedString("BetSettings.newVersion", value: "There is a new version available!", comment: "New version available")
         static let goTo = NSLocalizedString("BetSettings.goTo", value: "Go", comment: "Go")
+        static let lockWarning = NSLocalizedString("BetSettings.lockWarning", value: "Attention: After the 7th incorrect pin attempt, the wallet database will be deleted. The seed phrase will be required to restore any balance", comment: "Warning")
     }
 
     enum Betting {

diff --git a/breadwallet/src/CoreDatabase.swift b/breadwallet/src/CoreDatabase.swift
@@ -896,7 +896,7 @@ class CoreDatabase {
     }
 
     func loadEvents(_ eventID : UInt64,_ eventTimestamp : TimeInterval, callback: @escaping ([BetEventViewModel?])->Void) {
-        queue.async {
+
             var events = [BetEventViewModel?]()
             var sql: OpaquePointer? = nil
             sqlite3_prepare_v2(self.db, self.getEventsQuery( eventID, eventTimestamp ), -1, &sql, nil)
@@ -944,7 +944,7 @@ class CoreDatabase {
                 if !event.zeroedOdds()  {
                     events.append(event)
                 }
-            }
+
 
             if sqlite3_errcode(self.db) != SQLITE_DONE { print("SQLITE error loadEvents: " + String(cString: sqlite3_errmsg(self.db))) }
             DispatchQueue.main.async {

diff --git a/breadwallet/src/Sender.swift b/breadwallet/src/Sender.swift
@@ -216,7 +216,8 @@ class BitcoinSender: SenderBase<Wagerr, BTCWalletManager>, Sender {
     }
 
     func sendTransaction(allowBiometrics: Bool, pinVerifier: @escaping PinVerifier, completion: @escaping SendCompletion) {
-        guard readyToSend, let tx = transaction else { return completion(.creationError("not ready")) }
+        guard readyToSend else { return completion(.creationError("Not ready to send yet.")) }
+        guard let tx = transaction else { return completion(.creationError("Please ensure there is sufficient WGR for transaction fees")) }
 
         if allowBiometrics && UserDefaults.isBiometricsEnabled && walletManager.canUseBiometrics(forTx: tx) {
             sendWithBiometricVerification(tx: tx, pinVerifier: pinVerifier, completion: completion)

diff --git a/breadwallet/src/ViewControllers/RootNavigationController.swift b/breadwallet/src/ViewControllers/RootNavigationController.swift
@@ -74,10 +74,14 @@ class RootNavigationController : UINavigationController {
                         return
                     })
                 }
-                completion(false)
+                DispatchQueue.main.async    {   // completion affects UI
+                    completion(false)
+                }
             }
             else    {
-                completion(true)
+                DispatchQueue.main.async    {
+                    completion(true)
+                }
             }
         })
     }

diff --git a/breadwallet/src/Views/WalletDisabledView.swift b/breadwallet/src/Views/WalletDisabledView.swift
@@ -42,6 +42,7 @@ class WalletDisabledView : UIView {
     }
 
     private let label = UILabel(font: .customBold(size: 20.0), color: .darkText)
+    private let label2 = UILabel(font: .customBody(size: 16.0), color: .darkText)
     private let faq: UIButton
     private let blur: UIVisualEffectView
     private let reset = ShadowButton(title: S.UnlockScreen.resetPin, type: .blackTransparent)
@@ -56,6 +57,7 @@ class WalletDisabledView : UIView {
     private func addSubviews() {
         addSubview(blur)
         addSubview(label)
+        addSubview(label2)
         addSubview(faq)
         addSubview(reset)
     }
@@ -65,6 +67,11 @@ class WalletDisabledView : UIView {
         label.constrain([
             label.centerYAnchor.constraint(equalTo: blur.centerYAnchor),
             label.centerXAnchor.constraint(equalTo: blur.centerXAnchor) ])
+        label2.constrain([
+            label2.topAnchor.constraint(equalTo: label.bottomAnchor, constant: C.padding[4]),
+            label2.leadingAnchor.constraint(equalTo: blur.leadingAnchor, constant: C.padding[2]),
+            label2.trailingAnchor.constraint(equalTo: blur.trailingAnchor, constant: -C.padding[2]),
+            label2.centerXAnchor.constraint(equalTo: blur.centerXAnchor) ])
         faq.constrain([
             faq.leadingAnchor.constraint(equalTo: leadingAnchor, constant: C.padding[2]),
             faq.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -C.padding[2]),
@@ -75,11 +82,14 @@ class WalletDisabledView : UIView {
             reset.centerYAnchor.constraint(equalTo: faq.centerYAnchor),
             reset.heightAnchor.constraint(equalToConstant: C.Sizes.buttonHeight),
             reset.widthAnchor.constraint(equalToConstant: 200.0) ])
-
     }
 
     private func setData() {
         label.textAlignment = .center
+
+        label2.textAlignment = .center
+        label2.numberOfLines = 4
+        label2.text = S.BetSettings.lockWarning
     }
 
     required init?(coder aDecoder: NSCoder) {

diff --git a/breadwallet/src/Wallet/WalletManager+Auth.swift b/breadwallet/src/Wallet/WalletManager+Auth.swift
@@ -208,7 +208,7 @@ extension BTCWalletManager : WalletAuthenticator {
             else if !BTCWalletManager.failedPins.contains(pin) { // unique failed attempt
                 BTCWalletManager.failedPins.append(pin)
 
-                if (failCount >= 8) { // wipe wallet after 8 failed pin attempts and 24+ hours of lockout
+                if (failCount >= 7) { // WAGERR change to 7 (4hr) wipe wallet after 8 failed pin attempts and 24+ hours of lockout
                     Store.trigger(name: .wipeWalletNoPrompt)
                     return false
                 }