diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index 8b61542c7..33efa5970 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -558,6 +558,7 @@ 7527720D2AA9B2630066557E /* SupportedTopperAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7527720C2AA9B2630066557E /* SupportedTopperAssets.swift */; }; 7527720F2AA9F58E0066557E /* TopperViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7527720E2AA9F58E0066557E /* TopperViewModel.swift */; }; 752772122AAA1CE30066557E /* Coinbase-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 752772112AAA1CE30066557E /* Coinbase-Info.plist */; }; + 752C3ED22B1AF19C00F46CD3 /* BuySellPortal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C9FAABB42AB793CE00878224 /* BuySellPortal.storyboard */; }; 75303FE52AE7B70500870D8B /* CrowdNode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75303FE42AE7B70500870D8B /* CrowdNode.storyboard */; }; 75303FE62AE7B70500870D8B /* CrowdNode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75303FE42AE7B70500870D8B /* CrowdNode.storyboard */; }; 753FDBEA2AEA422F0005EEC3 /* Voting+UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753FDBE92AEA422F0005EEC3 /* Voting+UserDefaults.swift */; }; @@ -7856,6 +7857,7 @@ C9D2C90C2A320AA000D15901 /* DWDPRegistrationErrorTableViewCell.xib in Resources */, C9D2C90D2A320AA000D15901 /* ExploreDash.storyboard in Resources */, C9D2C90E2A320AA000D15901 /* TxDetailHeaderCell.xib in Resources */, + 752C3ED22B1AF19C00F46CD3 /* BuySellPortal.storyboard in Resources */, C9D2C9652A38733B00D15901 /* DPAssets.xcassets in Resources */, C9D2C90F2A320AA000D15901 /* StartStoryboard.storyboard in Resources */, C9D2C9112A320AA000D15901 /* DWShortcutCollectionViewCell~iphone.xib in Resources */, @@ -10041,7 +10043,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; @@ -10171,7 +10173,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -10377,7 +10379,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; @@ -10399,7 +10401,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; @@ -10419,7 +10421,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = C98AA93FF5283EC6405BCE4B /* Pods-WatchApp Extension.debug.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -10446,7 +10448,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = CE02413EF0C60B1D1EDE6457 /* Pods-WatchApp Extension.release.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -11158,7 +11160,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -11359,7 +11361,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; @@ -11379,7 +11381,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 556B5EBEBAEA571D74FF69A3 /* Pods-WatchApp Extension.testflight.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -11478,7 +11480,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = dashwallet/dashwallet.entitlements; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -11667,7 +11669,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; @@ -11687,7 +11689,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 29B232FD70BA2EDF87F86A56 /* Pods-WatchApp Extension.testnet.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 44RJ69WHFF; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; diff --git a/DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/CoinbaseEntryPointModel.swift b/DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/CoinbaseEntryPointModel.swift index 189828e09..8774721e9 100644 --- a/DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/CoinbaseEntryPointModel.swift +++ b/DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/CoinbaseEntryPointModel.swift @@ -21,7 +21,7 @@ import Foundation struct CoinbaseEntryPointItem: IntegrationEntryPointItem { let type: IntegrationItemType - static let supportedCases = [.buyDash, .convertCrypto, .transferDash].map { CoinbaseEntryPointItem(type: $0) } + static let supportedCases = [.buyDash, /*.convertCrypto,*/ .transferDash].map { CoinbaseEntryPointItem(type: $0) } var title: String { type.title } var icon: String { type.icon } @@ -34,8 +34,8 @@ struct CoinbaseEntryPointItem: IntegrationEntryPointItem { return NSLocalizedString("Receive directly into Dash Wallet", comment: "Coinbase Entry Point") case .sellDash: return NSLocalizedString("Receive directly into Coinbase", comment: "Coinbase Entry Point") - case .convertCrypto: - return NSLocalizedString("Between Dash Wallet and Coinbase", comment: "Coinbase Entry Point") +// case .convertCrypto: +// return NSLocalizedString("Between Dash Wallet and Coinbase", comment: "Coinbase Entry Point") case .transferDash: return NSLocalizedString("Between Dash Wallet and Coinbase", comment: "Coinbase Entry Point") } diff --git a/DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/IntegrationViewController+Coinbase.swift b/DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/IntegrationViewController+Coinbase.swift index 9756216dc..b07f79e4a 100644 --- a/DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/IntegrationViewController+Coinbase.swift +++ b/DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/IntegrationViewController+Coinbase.swift @@ -24,8 +24,8 @@ extension IntegrationViewController { return BuyDashViewController() case .sellDash: return BuyDashViewController() - case .convertCrypto: - return CustodialSwapsViewController() +// case .convertCrypto: +// return CustodialSwapsViewController() case .transferDash: return TransferAmountViewController() } diff --git a/DashWallet/Sources/UI/Coinbase/ServiceOverview/ServiceEntryPointModel.swift b/DashWallet/Sources/UI/Coinbase/ServiceOverview/ServiceEntryPointModel.swift index fe3057b5d..30487646c 100644 --- a/DashWallet/Sources/UI/Coinbase/ServiceOverview/ServiceEntryPointModel.swift +++ b/DashWallet/Sources/UI/Coinbase/ServiceOverview/ServiceEntryPointModel.swift @@ -48,9 +48,10 @@ extension Service { SupportedFeature(serviceName:NSLocalizedString("Buy Dash with fiat", comment: "Dash Service Overview"), imageName:"service.BuyDashwithfiat"), - SupportedFeature(serviceName:NSLocalizedString("Buy and convert Dash with another crypto", - comment: "Dash Service Overview"), - imageName:"service.BuyAndConvertDash"), +// Disable per MO-103 +// SupportedFeature(serviceName:NSLocalizedString("Buy and convert Dash with another crypto", +// comment: "Dash Service Overview"), +// imageName:"service.BuyAndConvertDash"), SupportedFeature(serviceName:NSLocalizedString("Transfer Dash", comment: "Dash Service Overview"), imageName:"service.TransferDash", diff --git a/DashWallet/Sources/UI/Portal/BuySellPortal.storyboard b/DashWallet/Sources/UI/Portal/BuySellPortal.storyboard index 9d2abbd0a..b028e5f02 100644 --- a/DashWallet/Sources/UI/Portal/BuySellPortal.storyboard +++ b/DashWallet/Sources/UI/Portal/BuySellPortal.storyboard @@ -1,9 +1,9 @@ - + - + @@ -74,13 +74,13 @@ - diff --git a/DashWallet/Sources/UI/Portal/Model/BaseIntegrationModel.swift b/DashWallet/Sources/UI/Portal/Model/BaseIntegrationModel.swift index 729267b66..028fd3f0e 100644 --- a/DashWallet/Sources/UI/Portal/Model/BaseIntegrationModel.swift +++ b/DashWallet/Sources/UI/Portal/Model/BaseIntegrationModel.swift @@ -23,7 +23,7 @@ import Combine enum IntegrationItemType: CaseIterable { case buyDash case sellDash - case convertCrypto +// case convertCrypto // disabled per MO-103 case transferDash } @@ -34,8 +34,8 @@ extension IntegrationItemType { return NSLocalizedString("Buy Dash", comment: "Integration Entry Point") case .sellDash: return NSLocalizedString("Sell Dash", comment: "Integration Entry Point") - case .convertCrypto: - return NSLocalizedString("Convert Crypto", comment: "Integration Entry Point") +// case .convertCrypto: +// return NSLocalizedString("Convert Crypto", comment: "Integration Entry Point") case .transferDash: return NSLocalizedString("Transfer Dash", comment: "Integration Entry Point") } @@ -47,8 +47,8 @@ extension IntegrationItemType { return "integration.buy" case .sellDash: return "integration.sell" - case .convertCrypto: - return "integration.convert" +// case .convertCrypto: +// return "integration.convert" case .transferDash: return "integration.transfer" }