diff --git a/litewallet.xcodeproj/project.pbxproj b/litewallet.xcodeproj/project.pbxproj index 668d3a16..aefc5436 100644 --- a/litewallet.xcodeproj/project.pbxproj +++ b/litewallet.xcodeproj/project.pbxproj @@ -4530,7 +4530,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = litewallet/litewallet.entitlements; - CURRENT_PROJECT_VERSION = 240513.0; + CURRENT_PROJECT_VERSION = 240516.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZV7987N2ZC; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; @@ -4887,7 +4887,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = litewallet/litewallet.entitlements; - CURRENT_PROJECT_VERSION = 240513.0; + CURRENT_PROJECT_VERSION = 240516.1; DEVELOPMENT_TEAM = ZV7987N2ZC; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -5028,7 +5028,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = litewallet/litewallet.entitlements; - CURRENT_PROJECT_VERSION = 240513.0; + CURRENT_PROJECT_VERSION = 240516.1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZV7987N2ZC; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = NO; diff --git a/litewallet/BuyTableViewController.swift b/litewallet/BuyTableViewController.swift index 40d61f86..ae4ef266 100644 --- a/litewallet/BuyTableViewController.swift +++ b/litewallet/BuyTableViewController.swift @@ -9,14 +9,15 @@ class BuyTableViewController: UITableViewController, SFSafariViewControllerDeleg @IBOutlet var bitrefillDetailsLabel: UILabel! @IBOutlet var bitrefillCellContainerView: UIView! @IBAction func didTapBitrefill(_: UIButton) { - guard let url = URL(string: "https://www.bitrefill.com/?ref=bAshL935") - else { - return - } - - let sfSafariVC = SFSafariViewController(url: url) - sfSafariVC.delegate = self - present(sfSafariVC, animated: true) + /// DEV: Until Compliance data is sent . KCW_051624 + // guard let url = URL(string: "https://www.bitrefill.com/?ref=bAshL935") + // else { + // return + // } + // + // let sfSafariVC = SFSafariViewController(url: url) + // sfSafariVC.delegate = self + // present(sfSafariVC, animated: true) } // MARK: Moonpay UI @@ -39,42 +40,10 @@ class BuyTableViewController: UITableViewController, SFSafariViewControllerDeleg present(sfSafariVC, animated: true) } - // MARK: Simplex UI - - @IBOutlet var simplexLogoImageView: UIImageView! - @IBOutlet var simplexHeaderLabel: UILabel! - @IBOutlet var simplexDetailsLabel: UILabel! - @IBOutlet var simplexCellContainerView: UIView! - @IBOutlet var simplexCurrencySegmentedControl: UISegmentedControl! - private var currencyCode: String = "USD" private let uuidString: String = UIDevice.current.identifierForVendor?.uuidString ?? "" private let currentWalletAddress: String = WalletManager.sharedInstance.wallet?.receiveAddress ?? "" - @IBAction func didTapSimplex(_: Any) { - if let vcWKVC = UIStoryboard(name: "Buy", bundle: nil).instantiateViewController(withIdentifier: "BuyWKWebViewController") as? BuyWKWebViewController { - vcWKVC.currencyCode = currencyCode - vcWKVC.currentWalletAddress = currentWalletAddress - vcWKVC.uuidString = uuidString - vcWKVC.timestamp = Int(Date().timeIntervalSince1970) - addChild(vcWKVC) - view.addSubview(vcWKVC.view) - vcWKVC.didMove(toParent: self) - - vcWKVC.didDismissChildView = { - for vc in self.children { - DispatchQueue.main.async { - vc.willMove(toParent: nil) - vc.view.removeFromSuperview() - vc.removeFromParent() - } - } - } - } else { - NSLog("ERROR: Storyboard not initialized") - } - } - var store: Store? var walletManager: WalletManager? @@ -93,11 +62,11 @@ class BuyTableViewController: UITableViewController, SFSafariViewControllerDeleg moonpaySegmentedControl.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.white], for: .normal) moonpaySegmentedControl.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.liteWalletBlue], for: .selected) - simplexCurrencySegmentedControl.addTarget(self, action: #selector(didChangeCurrencySimplex), for: .valueChanged) - simplexCurrencySegmentedControl.selectedSegmentIndex = PartnerFiatOptions.usd.index - simplexCurrencySegmentedControl.selectedSegmentTintColor = .white - simplexCurrencySegmentedControl.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.white], for: .normal) - simplexCurrencySegmentedControl.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.liteWalletBlue], for: .selected) + /// DEV: Until Compliance data is sent . KCW_051624 + bitrefillLogoImageView.alpha = 0.0 + bitrefillHeaderLabel.alpha = 0.0 + bitrefillDetailsLabel.alpha = 0.0 + bitrefillCellContainerView.alpha = 0.0 setupWkVCData() @@ -114,6 +83,9 @@ class BuyTableViewController: UITableViewController, SFSafariViewControllerDeleg bitrefillCellContainerView.layer.borderWidth = 1.0 bitrefillCellContainerView.clipsToBounds = true + /// DEV: Until Compliance data is sent . KCW_051624 + bitrefillCellContainerView.alpha = 0.0 + let moonpayData = Partner.partnerDataArray()[1] moonpayLogoImageView.image = moonpayData.logo moonpayHeaderLabel.text = moonpayData.headerTitle @@ -122,15 +94,6 @@ class BuyTableViewController: UITableViewController, SFSafariViewControllerDeleg moonpayCellContainerView.layer.borderColor = UIColor.white.cgColor moonpayCellContainerView.layer.borderWidth = 1.0 moonpayCellContainerView.clipsToBounds = true - - let simplexData = Partner.partnerDataArray()[2] - simplexLogoImageView.image = simplexData.logo - simplexHeaderLabel.text = simplexData.headerTitle - simplexDetailsLabel.text = simplexData.details - simplexCellContainerView.layer.cornerRadius = 6.0 - simplexCellContainerView.layer.borderColor = UIColor.white.cgColor - simplexCellContainerView.layer.borderWidth = 1.0 - simplexCellContainerView.clipsToBounds = true } @objc private func didChangeCurrencyMoonpay() { @@ -140,12 +103,4 @@ class BuyTableViewController: UITableViewController, SFSafariViewControllerDeleg print("Error: Code not found: \(moonpaySegmentedControl.selectedSegmentIndex)") } } - - @objc private func didChangeCurrencySimplex() { - if let code = PartnerFiatOptions(rawValue: simplexCurrencySegmentedControl.selectedSegmentIndex)?.description { - currencyCode = code - } else { - print("Error: Code not found: \(simplexCurrencySegmentedControl.selectedSegmentIndex)") - } - } } diff --git a/litewallet/Constants/Functions.swift b/litewallet/Constants/Functions.swift index 10b1c6fc..9797a855 100644 --- a/litewallet/Constants/Functions.swift +++ b/litewallet/Constants/Functions.swift @@ -39,9 +39,9 @@ func strongify(_ context: Context?, closure: @esc } } -/// Description: 1709405141 +/// Description: 1715876807 func tieredOpsFee(store: Store, amount: UInt64) -> UInt64 { - var usdRate = 67.000 + var usdRate = 83.000 if let liveRate = store.state.rates.filter({ $0.code == "USD" }).first?.rate { usdRate = liveRate } @@ -49,7 +49,8 @@ func tieredOpsFee(store: Store, amount: UInt64) -> UInt64 { switch usdInLTC { case 0 ..< 20.00: - return UInt64(0.20 / usdRate * 100_000_000) + let lowRate = usdInLTC * 0.01 + return UInt64(lowRate / usdRate * 100_000_000) case 20.00 ..< 50.00: return UInt64(0.30 / usdRate * 100_000_000) case 50.00 ..< 100.00: diff --git a/litewallet/Storyboards/Buy.storyboard b/litewallet/Storyboards/Buy.storyboard index a7ecdc06..874415f3 100644 --- a/litewallet/Storyboards/Buy.storyboard +++ b/litewallet/Storyboards/Buy.storyboard @@ -1,9 +1,9 @@ - + - + @@ -23,7 +23,7 @@ - + @@ -31,89 +31,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -123,13 +42,13 @@ - + @@ -237,126 +156,82 @@ - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + @@ -380,11 +255,6 @@ - - - - - @@ -394,7 +264,7 @@ - + @@ -500,7 +370,7 @@ - +