diff --git a/breadwallet.xcodeproj/project.pbxproj b/breadwallet.xcodeproj/project.pbxproj index f2a666b0..a7d7baa8 100644 --- a/breadwallet.xcodeproj/project.pbxproj +++ b/breadwallet.xcodeproj/project.pbxproj @@ -5520,12 +5520,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -5540,12 +5540,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -5563,12 +5563,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "Wagerr Pro"; PROVISIONING_PROFILE = ""; @@ -5588,12 +5588,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "Wagerr Pro"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -5613,12 +5613,12 @@ CODE_SIGN_ENTITLEMENTS = breadwallet/breadwallet.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; OTHER_SWIFT_FLAGS = "-DDebug"; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Pro"; @@ -5640,12 +5640,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Pro"; @@ -5718,12 +5718,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -5734,12 +5734,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -5750,11 +5750,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5765,11 +5765,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -5779,12 +5779,12 @@ 75A2A8251DA5938500A983D8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -5795,12 +5795,12 @@ 75A2A8261DA5938500A983D8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -5952,12 +5952,12 @@ CODE_SIGN_ENTITLEMENTS = breadwallet/breadwallet.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; OTHER_SWIFT_FLAGS = "-DDebug -DScreenshots -DTestnet"; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Pro"; @@ -6005,12 +6005,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "Wagerr Pro"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -6025,12 +6025,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -6045,12 +6045,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -6061,11 +6061,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6075,12 +6075,12 @@ CEA7E6901F09AC6A001F8C27 /* Screenshots */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -6281,12 +6281,12 @@ CODE_SIGN_ENTITLEMENTS = breadwallet/breadwallet.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; OTHER_SWIFT_FLAGS = "-DDebug -DTestnet"; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.testnet; PRODUCT_NAME = "Wagerr Pro"; @@ -6334,12 +6334,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.testnet.watchkitapp; PRODUCT_NAME = "Wagerr Pro"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -6354,12 +6354,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.testnet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -6374,12 +6374,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.testnet.watchkitapp.Ext; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -6390,11 +6390,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.testnet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6404,12 +6404,12 @@ CEA7E6A31F0AAA84001F8C27 /* Testnet */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -6604,12 +6604,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/**"; INFOPLIST_FILE = breadwallet/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; OTHER_SWIFT_FLAGS = "-DTestflight -DDebug"; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet; PRODUCT_NAME = "Wagerr Pro"; @@ -6657,12 +6657,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; ENABLE_BITCODE = YES; IBSC_MODULE = breadwallet_WatchKit_Extension; INFOPLIST_FILE = "breadwallet WatchKit App/Info.plist"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp; PRODUCT_NAME = "Wagerr Pro"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -6677,12 +6677,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -6697,12 +6697,12 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.watchkitapp.Ext; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; @@ -6713,11 +6713,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements; - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; DEVELOPMENT_TEAM = GZ55ZWQ3G3; INFOPLIST_FILE = TodayExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 3.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -6727,12 +6727,12 @@ CEE0EF5C1EBF8D7F0018DB36 /* Testflight */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 354; + CURRENT_PROJECT_VERSION = 356; 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.5.4; + MARKETING_VERSION = 3.5.6; PRODUCT_BUNDLE_IDENTIFIER = org.wagerr.betwallet.TodayExt; PRODUCT_NAME = "Wagerr Pro"; SKIP_INSTALL = YES; diff --git a/breadwallet/EventCells/EventBetOptionCell.swift b/breadwallet/EventCells/EventBetOptionCell.swift index a0dd0e3c..5923b5b7 100644 --- a/breadwallet/EventCells/EventBetOptionCell.swift +++ b/breadwallet/EventCells/EventBetOptionCell.swift @@ -30,11 +30,13 @@ struct EventBetChoice { let option : EventBetOption let type : EventBetType let odd : Double + let effectiveOdd : Double - init(option: EventBetOption, type: EventBetType, odd: Double) { + init(option: EventBetOption, type: EventBetType, odd: Double, effectiveOdd: Double) { self.option = option self.type = type self.odd = odd + self.effectiveOdd = effectiveOdd } func getOutcome() -> BetOutcome { @@ -100,7 +102,7 @@ struct EventBetChoice { case .none: ret = 0 case .parlay: - ret = odd * Double(EventMultipliers.ODDS_MULTIPLIER) + return effectiveOdd } ret = ret / Double(EventMultipliers.ODDS_MULTIPLIER) ret = ((ret-1)*0.94)+1 @@ -145,14 +147,14 @@ class EventBetOptionTotalsCell : EventBetOptionCell { @objc override func actionTappedHome() { guard home != "N/A" else { return } - let choice = EventBetChoice.init(option: self.option, type: .over, odd: Double(homeLabel.text!)!) + let choice = EventBetChoice.init(option: self.option, type: .over, odd: Double(homeLabel.text!)!,effectiveOdd: 0) self.cellDelegate?.didTapBetOption ( choice: choice, isSelected: homeLabel.toggleLabel() ) print("tapped") } @objc override func actionTappedAway() { guard away != "N/A" else { return } - let choice = EventBetChoice.init(option: self.option, type: .under, odd: Double(awayLabel.text!)!) + let choice = EventBetChoice.init(option: self.option, type: .under, odd: Double(awayLabel.text!)!,effectiveOdd: 0) self.cellDelegate?.didTapBetOption ( choice: choice, isSelected: awayLabel.toggleLabel() ) print("tapped") } @@ -266,21 +268,21 @@ class EventBetOptionCell: EventDetailRowCell { // MARK: - Tap actions @objc func actionTappedHome() { guard home != "N/A" else { return } - let choice = EventBetChoice.init(option: self.option, type: .home, odd: Double(homeLabel.text!)!) + let choice = EventBetChoice.init(option: self.option, type: .home, odd: Double(homeLabel.text!)!,effectiveOdd: 0) self.cellDelegate?.didTapBetOption ( choice: choice, isSelected: homeLabel.toggleLabel() ) print("tapped") } @objc func actionTappedDraw() { guard draw != "N/A" else { return } - let choice = EventBetChoice.init(option: self.option, type: .draw, odd: Double(drawLabel.text!)!) + let choice = EventBetChoice.init(option: self.option, type: .draw, odd: Double(drawLabel.text!)!,effectiveOdd: 0) self.cellDelegate?.didTapBetOption ( choice: choice, isSelected: drawLabel.toggleLabel() ) print("tapped") } @objc func actionTappedAway() { guard away != "N/A" else { return } - let choice = EventBetChoice.init(option: self.option, type: .away, odd: Double(awayLabel.text!)!) + let choice = EventBetChoice.init(option: self.option, type: .away, odd: Double(awayLabel.text!)!,effectiveOdd: 0) self.cellDelegate?.didTapBetOption ( choice: choice, isSelected: awayLabel.toggleLabel() ) } diff --git a/breadwallet/EventCells/ParlaySliderCell.swift b/breadwallet/EventCells/ParlaySliderCell.swift index 20d206bd..f033a609 100644 --- a/breadwallet/EventCells/ParlaySliderCell.swift +++ b/breadwallet/EventCells/ParlaySliderCell.swift @@ -32,13 +32,22 @@ class ParlaySliderCell: EventSliderCellBase { var totalOdd : UInt32 { var ret : Double = 1.0 for leg in viewModel.legs { - ret *= Double(leg.odd) / Double(EventMultipliers.ODDS_MULTIPLIER) + let odd = Double(leg.odd) / Double(EventMultipliers.ODDS_MULTIPLIER) + ret *= odd } - self.betChoice = EventBetChoice.init(option: .none, type: .parlay, odd: ret) - + return UInt32( ret * Double(EventMultipliers.ODDS_MULTIPLIER) ) } + var effectiveOdd : UInt32 { + var effective : Double = 1.0 + for leg in viewModel.legs { + let odd = Double(leg.odd) / Double(EventMultipliers.ODDS_MULTIPLIER) + effective *= ((odd-1)*0.94)+1 + } + return UInt32( effective * Double(EventMultipliers.ODDS_MULTIPLIER) ) + } + // MARK: - Init override func addSubviews() { @@ -69,7 +78,8 @@ class ParlaySliderCell: EventSliderCellBase { } func updateTotalOdds() { - totalOddLabel.text = BetEventDatabaseModel.getOddTx(odd: totalOdd) + totalOddLabel.text = BetEventDatabaseModel.getRawOddTx(odd: (UserDefaults.showNetworkFeesInOdds) ? totalOdd : effectiveOdd) + self.betChoice = EventBetChoice.init(option: .none, type: .parlay, odd: Double(totalOdd) / Double(EventMultipliers.ODDS_MULTIPLIER), effectiveOdd: Double(effectiveOdd) / Double(EventMultipliers.ODDS_MULTIPLIER) ) } } diff --git a/breadwallet/EventDetailViewController.swift b/breadwallet/EventDetailViewController.swift index c186b783..8e3f5545 100644 --- a/breadwallet/EventDetailViewController.swift +++ b/breadwallet/EventDetailViewController.swift @@ -218,7 +218,7 @@ class EventDetailViewController: UIViewController, Subscriber, EventBetOptionDel tableView.deleteRows(at: [IndexPath(row: sliderPosToRemove, section: 0)], with: .none) tableView.endUpdates() sliderPosToRemove = 0 - let choice = EventBetChoice.init(option: .none, type: .none, odd: 1.0 ) + let choice = EventBetChoice.init(option: .none, type: .none, odd: 1.0, effectiveOdd: 0 ) dataSource?.cleanBetOptions( choice: choice ) } diff --git a/breadwallet/WagerrEntities.swift b/breadwallet/WagerrEntities.swift index 208c963e..7b008300 100644 --- a/breadwallet/WagerrEntities.swift +++ b/breadwallet/WagerrEntities.swift @@ -182,6 +182,19 @@ class BetEventDatabaseModel : BetCore { return ret } + // raw = regardless of effective or in-chain + static func getRawOddTx(odd : UInt32) -> String { + var truncatedOdd = Double(getRawOdd(odd: Float(odd) / Float(EventMultipliers.ODDS_MULTIPLIER) )) + truncatedOdd = truncatedOdd.truncate(places: 2) + var ret = (odd==0) ? "N/A" : getOddNumberFormat.string(from: NSNumber(value: truncatedOdd) )! + + if ret == "+100" { + ret = "-100" + } + + return ret + } + static var getOddNumberFormat : NumberFormatter { let nf = NumberFormatter() nf.numberStyle = .decimal @@ -199,6 +212,13 @@ class BetEventDatabaseModel : BetCore { return ret } + // raw = regardless of effective or in-chain + public static func getRawOdd( odd : Float ) -> Float { + var ret = odd + ret = (UserDefaults.showAmericanNotationInOdds) ? DecimalToAmerican(odd: ret) : ret + return ret + } + static func DecimalToAmerican( odd : Float ) -> Float { if odd > 2.0 { return (odd - 1.0) * 100.0