diff --git a/breadwallet.xcodeproj/project.pbxproj b/breadwallet.xcodeproj/project.pbxproj index 8d5fab81..621c5320 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.0.4; + MARKETING_VERSION = 3.0.5; 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 = 304; + CURRENT_PROJECT_VERSION = 305; 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.4; + MARKETING_VERSION = 3.0.5; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/breadwallet/EventDetailViewController.swift b/breadwallet/EventDetailViewController.swift index ec24d902..0b662f87 100644 --- a/breadwallet/EventDetailViewController.swift +++ b/breadwallet/EventDetailViewController.swift @@ -98,7 +98,10 @@ class EventDetailViewController: UIViewController, Subscriber, EventBetOptionDel guard let oldEvents = $0[self.viewModel.currency]?.events else { return false } guard let newEvents = $1[self.viewModel.currency]?.events else { return false } return oldEvents != newEvents }, callback: { [unowned self] in - guard let event = $0[self.viewModel.currency]?.events.first(where: { $0.eventID == self.viewModel.eventID }) else { return } + guard let event = $0[self.viewModel.currency]?.events.first(where: { $0.eventID == self.viewModel.eventID }) else { + // close slip + self.close() + return } self.event = event }) } @@ -297,8 +300,8 @@ class EventDetailViewController: UIViewController, Subscriber, EventBetOptionDel private func reload() { viewModel = event - //dataSource = EventDetailDataSource(viewModel: viewModel) - //tableView.dataSource = dataSource + self.dataSource = EventDetailDataSource(tableView: tableView, viewModel: viewModel, controller: self) + tableView.dataSource = dataSource tableView.reloadData() } @@ -339,9 +342,15 @@ extension EventDetailViewController { */ //Need to calculate keyboard exact size due to Apple suggestions self.tableView.isScrollEnabled = true + var offset = CGFloat(0) + if #available(iOS 11.0, *) { + if E.isIPhoneXOrBetter { + offset = view.safeAreaInsets.bottom + } + } let info : NSDictionary = notification.userInfo! as NSDictionary let keyboardSize = (info[UIKeyboardFrameBeginUserInfoKey] as? NSValue)?.cgRectValue.size - let contentInsets : UIEdgeInsets = UIEdgeInsetsMake(0.0, 0.0, keyboardSize!.height, 0.0) + let contentInsets : UIEdgeInsets = UIEdgeInsetsMake(0.0, 0.0, keyboardSize!.height + offset, 0.0) self.tableView.contentInset = contentInsets self.tableView.scrollIndicatorInsets = contentInsets @@ -353,12 +362,14 @@ extension EventDetailViewController { /* var aRect : CGRect = self.view.frame - aRect.size.height -= keyboardSize!.height + aRect.size.height -= keyboardSize!.height + offset if let activeFrame = self.dataSource?.sliderCell?.amountTextFrame { if (!aRect.contains(activeFrame.origin)) { - self.tableView.scrollRectToVisible(activeFrame, animated: true) + DispatchQueue.main.async { + self.tableView.scrollRectToVisible(activeFrame, animated: true) + } } } */ diff --git a/breadwallet/src/ViewControllers/TransactionsTableViewController.swift b/breadwallet/src/ViewControllers/TransactionsTableViewController.swift index 61afeeba..ffdff0b0 100644 --- a/breadwallet/src/ViewControllers/TransactionsTableViewController.swift +++ b/breadwallet/src/ViewControllers/TransactionsTableViewController.swift @@ -244,6 +244,7 @@ extension TransactionsTableViewController { if transactionInfo[tx.hash] != nil { transactionInfo[tx.hash]?.transaction = tx as! BtcTransaction + transactionInfo[tx.hash]?.currentHeight = walletManager.peerManager!.lastBlockHeight // update currheight for payouts cell.setTransaction(viewModel, isBtcSwapped: self.isBtcSwapped, rate: rate, diff --git a/breadwallet/src/ViewModels/Transaction.swift b/breadwallet/src/ViewModels/Transaction.swift index 8754e150..c193f304 100644 --- a/breadwallet/src/ViewModels/Transaction.swift +++ b/breadwallet/src/ViewModels/Transaction.swift @@ -82,7 +82,8 @@ func ==(lhs: Transaction, rhs: Transaction) -> Bool { return lhs.hash == rhs.hash && lhs.status == rhs.status && lhs.comment == rhs.comment && - lhs.hasKvStore == rhs.hasKvStore + lhs.hasKvStore == rhs.hasKvStore && + lhs.confirmations == rhs.confirmations } func ==(lhs: [Transaction], rhs: [Transaction]) -> Bool { diff --git a/breadwallet/src/Wallet/BtcWalletManager.swift b/breadwallet/src/Wallet/BtcWalletManager.swift index ed3562b8..175326dd 100644 --- a/breadwallet/src/Wallet/BtcWalletManager.swift +++ b/breadwallet/src/Wallet/BtcWalletManager.swift @@ -20,6 +20,7 @@ class BTCWalletManager : WalletManager { private let progressUpdateInterval: TimeInterval = 0.5 private let updateDebounceInterval: TimeInterval = 0.4 private let updateEventInterval: TimeInterval = 5 + private let minuteInterval: TimeInterval = 60 private var progressTimer: Timer? private var lastBlockHeightKey: String { return "LastBlockHeightKey-\(currency.code)" @@ -31,6 +32,7 @@ class BTCWalletManager : WalletManager { private var retryTimer: RetryTimer? private var updateTimer: Timer? private var eventUpdateTimer: Timer? + private var minuteTimer: Timer? var kvStore: BRReplicatedKVStore? { didSet { requestTxUpdate() } @@ -110,6 +112,7 @@ class BTCWalletManager : WalletManager { } else { self.db = CoreDatabase() } + self.minuteTimer = Timer.scheduledTimer(timeInterval: minuteInterval, target: self, selector: #selector(updateTransactions), userInfo: nil, repeats: true) } var isWatchOnly: Bool { @@ -286,7 +289,9 @@ extension BTCWalletManager : BRWalletListener { } @objc private func updateTransactions() { - updateTimer?.invalidate() + if updateTimer != nil { + updateTimer?.invalidate() + } updateTimer = nil DispatchQueue.global(qos: .utility).async { [weak self] in guard let myself = self else { return }