diff --git a/breadwallet.xcodeproj/project.pbxproj b/breadwallet.xcodeproj/project.pbxproj index c2239084..d4703173 100644 --- a/breadwallet.xcodeproj/project.pbxproj +++ b/breadwallet.xcodeproj/project.pbxproj @@ -5428,12 +5428,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; INFOPLIST_FILE = "breadwallet WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -5448,12 +5448,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; INFOPLIST_FILE = "breadwallet WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -5471,12 +5471,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -5496,12 +5496,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -5521,12 +5521,12 @@ CODE_SIGN_ENTITLEMENTS = breadwallet/breadwallet.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; OTHER_SWIFT_FLAGS = "-DDebug"; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Bet"; @@ -5547,12 +5547,12 @@ CODE_SIGN_ENTITLEMENTS = breadwallet/breadwallet.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Bet"; @@ -5625,12 +5625,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = MessagesExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5641,12 +5641,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = MessagesExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5657,11 +5657,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5672,11 +5672,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5686,12 +5686,12 @@ 75A2A8251DA5938500A983D8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = NotificationServiceExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5702,12 +5702,12 @@ 75A2A8261DA5938500A983D8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = NotificationServiceExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5859,12 +5859,12 @@ CODE_SIGN_ENTITLEMENTS = breadwallet/breadwallet.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; OTHER_SWIFT_FLAGS = "-DDebug -DScreenshots -DTestnet"; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Bet"; @@ -5912,12 +5912,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -5932,12 +5932,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; INFOPLIST_FILE = "breadwallet WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -5952,12 +5952,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = MessagesExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5968,11 +5968,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5982,12 +5982,12 @@ CEA7E6901F09AC6A001F8C27 /* Screenshots */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = NotificationServiceExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6188,12 +6188,12 @@ CODE_SIGN_ENTITLEMENTS = breadwallet/breadwallet.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; OTHER_SWIFT_FLAGS = "-DDebug -DTestnet"; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Bet"; @@ -6241,12 +6241,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -6261,12 +6261,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; INFOPLIST_FILE = "breadwallet WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -6281,12 +6281,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = MessagesExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6297,11 +6297,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6311,12 +6311,12 @@ CEA7E6A31F0AAA84001F8C27 /* Testnet */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = NotificationServiceExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6510,12 +6510,12 @@ CODE_SIGN_ENTITLEMENTS = breadwallet/breadwallet.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; OTHER_SWIFT_FLAGS = "-DTestflight -DDebug"; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Bet"; @@ -6563,12 +6563,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -6583,12 +6583,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; INFOPLIST_FILE = "breadwallet WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -6603,12 +6603,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = MessagesExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6619,11 +6619,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6633,12 +6633,12 @@ CEE0EF5C1EBF8D7F0018DB36 /* Testflight */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 301; + CURRENT_PROJECT_VERSION = 302; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = NotificationServiceExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.1; + MARKETING_VERSION = 3.0.2; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/breadwallet/EventCells/EventBetOptionCell.swift b/breadwallet/EventCells/EventBetOptionCell.swift index f56cd43e..339a19eb 100644 --- a/breadwallet/EventCells/EventBetOptionCell.swift +++ b/breadwallet/EventCells/EventBetOptionCell.swift @@ -171,7 +171,10 @@ class EventBetOptionCell: EventDetailRowCell { option = .MoneyLine super.init(style: style, reuseIdentifier: reuseIdentifier) setupViews() - addGestures() + let balanceAmount = (Currencies.btc.state?.balance!.asUInt64)!/C.satoshis + if Float(balanceAmount) >= W.BetAmount.min { + addGestures() + } } // MARK: - Accessors diff --git a/breadwallet/src/Constants/Strings.swift b/breadwallet/src/Constants/Strings.swift index f34461cd..3b1eca0f 100644 --- a/breadwallet/src/Constants/Strings.swift +++ b/breadwallet/src/Constants/Strings.swift @@ -216,7 +216,6 @@ enum S { enum Betting { static let errorMinimum = NSLocalizedString("Betting.errorMinimum", value:"Minimum bet is %d %@", comment: "ninimum bet error message.") static let errorTimeout = NSLocalizedString("Betting.errorTimeout", value:"Event is closed for betting", comment: "Event closed") - static let errorMinBet = NSLocalizedString("Betting.errorMinBet", value:"Minimum bet is %d %@", comment: "Minimum bet error") static let errorSyncinc = NSLocalizedString("Betting.errorSyncinc", value:"Cannot bet while still syncing", comment: "Syncing error") static let payoutImmature = NSLocalizedString("Betting.payoutImmature", value:"Immature", comment: "Immature") } diff --git a/breadwallet/src/ViewControllers/LoginViewController.swift b/breadwallet/src/ViewControllers/LoginViewController.swift index 295455bc..3009c9fb 100644 --- a/breadwallet/src/ViewControllers/LoginViewController.swift +++ b/breadwallet/src/ViewControllers/LoginViewController.swift @@ -46,6 +46,9 @@ class LoginViewController : UIViewController, Subscriber, Trackable { private let isPresentedForLock: Bool private let disabledView: WalletDisabledView private let activityView = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge) + + private var isViewAppear = false + private var isLoginAllowed = false private var logo: UIImageView = { let image = UIImageView(image: #imageLiteral(resourceName: "Logo")) @@ -132,11 +135,23 @@ class LoginViewController : UIViewController, Subscriber, Trackable { @objc func willEnterForeground() { let nc = self.presentingViewController as? RootNavigationController - nc?.checkGitHubVersion(controller: self) + nc?.checkGitHubVersion(controller: self, completion: { isLoginAllowed in + self.isLoginAllowed = isLoginAllowed + if self.isLoginAllowed && self.isViewAppear { + self.doPrepareLogin() + } + }) } override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) + isViewAppear = true + if isLoginAllowed { + doPrepareLogin() + } + } + + func doPrepareLogin() { guard UIApplication.shared.applicationState != .background else { return } if shouldUseBiometrics && !hasAttemptedToShowBiometrics && !isPresentedForLock && UserDefaults.hasShownWelcome { hasAttemptedToShowBiometrics = true @@ -146,11 +161,16 @@ class LoginViewController : UIViewController, Subscriber, Trackable { lockIfNeeded() } } - + override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) let nc = self.presentingViewController as? RootNavigationController - nc?.checkGitHubVersion(controller: self) + nc?.checkGitHubVersion(controller: self, completion: { isLoginAllowed in + self.isLoginAllowed = isLoginAllowed + if self.isLoginAllowed && self.isViewAppear { + self.doPrepareLogin() + } + }) } override func viewDidDisappear(_ animated: Bool) { diff --git a/breadwallet/src/ViewControllers/RootNavigationController.swift b/breadwallet/src/ViewControllers/RootNavigationController.swift index 209da6f6..a0dc2a70 100644 --- a/breadwallet/src/ViewControllers/RootNavigationController.swift +++ b/breadwallet/src/ViewControllers/RootNavigationController.swift @@ -52,7 +52,7 @@ class RootNavigationController : UINavigationController { self.delegate = self } - func checkGitHubVersion(controller: UIViewController) { + func checkGitHubVersion(controller: UIViewController,completion: @escaping (Bool)->Void) { self.fetchGitHubVersion( completion: { data in guard let data = data else { return } let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String @@ -63,7 +63,7 @@ class RootNavigationController : UINavigationController { DispatchQueue.main.async { let alert = UIAlertController(title: S.BetSettings.newVersionTitle, message: S.BetSettings.newVersion, preferredStyle: .alert) alert.addAction(UIAlertAction(title: S.BetSettings.goTo, style: .default, handler: { _ in - let url = URL(string:"http://iosapp.wagerr.com/")! + let url = URL(string:"https://iosapp.wagerr.com/")! if #available(iOS 10.0, *) { UIApplication.shared.open(url, options: [:], completionHandler: nil) } else { @@ -74,7 +74,10 @@ class RootNavigationController : UINavigationController { return }) } - + completion(false) + } + else { + completion(true) } }) } diff --git a/breadwallet/src/ViewControllers/StartViewController.swift b/breadwallet/src/ViewControllers/StartViewController.swift index 13b78259..51bfb941 100644 --- a/breadwallet/src/ViewControllers/StartViewController.swift +++ b/breadwallet/src/ViewControllers/StartViewController.swift @@ -45,13 +45,13 @@ class StartViewController : UIViewController { @objc func willEnterForeground() { let nc = self.presentingViewController as? RootNavigationController - nc?.checkGitHubVersion(controller: self) + nc?.checkGitHubVersion(controller: self,completion: {_ in } ) } override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) let nc = self.presentingViewController as? RootNavigationController - nc?.checkGitHubVersion(controller: self) + nc?.checkGitHubVersion(controller: self, completion: {_ in } ) } private func setData() { diff --git a/breadwallet/src/ViewModels/EventDetailDatasource.swift b/breadwallet/src/ViewModels/EventDetailDatasource.swift index d25cdd1b..ecd49d1e 100644 --- a/breadwallet/src/ViewModels/EventDetailDatasource.swift +++ b/breadwallet/src/ViewModels/EventDetailDatasource.swift @@ -151,7 +151,7 @@ extension EventDetailDataSource: UITableViewDataSource { let headerCell = cell as! EventHeaderCell headerCell.header = viewModel.title let balanceAmount = (Currencies.btc.state?.balance!.asUInt64)!/C.satoshis - headerCell.error = (Float(balanceAmount) < W.BetAmount.min) ? String.init(format: S.Betting.errorMinimum, W.BetAmount.min, Currencies.btc.code) : "" + headerCell.error = (Float(balanceAmount) < W.BetAmount.min) ? String.init(format: S.Betting.errorMinimum, Int(W.BetAmount.min), Currencies.btc.code) : "" case .date: let dateCell = cell as! EventDateCell