Skip to content

Commit

Permalink
[IOS-152] Remove discount fee info (KYRDTeam#186)
Browse files Browse the repository at this point in the history
  • Loading branch information
MrQKyber authored Oct 16, 2020
1 parent da88fcc commit 8d84042
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class KNCreateLimitOrderV2ViewController: KNBaseViewController {
@IBOutlet weak var availableBalanceTextLabel: UILabel!
@IBOutlet weak var feeTextLabel: UILabel!
@IBOutlet weak var totalTextLabel: UILabel!
@IBOutlet weak var learnMoreButton: UIButton!
@IBOutlet weak var containerScrollView: UIScrollView!

fileprivate var updateFeeTimer: Timer?
Expand Down Expand Up @@ -125,7 +124,6 @@ class KNCreateLimitOrderV2ViewController: KNBaseViewController {
self.totalTextLabel.text = "Total".toBeLocalised().uppercased()
self.availableBalanceTextLabel.text = "Available Balance".toBeLocalised().uppercased()
self.feeTextLabel.text = NSLocalizedString("fee", value: "Fee", comment: "")
self.learnMoreButton.setTitle("Learn more".toBeLocalised(), for: .normal)
self.mainManageOrdersButton.setTitle("Manage Orders".toBeLocalised(), for: .normal)
self.relatedManageOrderButton.setTitle("Manage Orders".toBeLocalised(), for: .normal)
self.relatedOrderTextLabel.text = "Related Orders".toBeLocalised().uppercased()
Expand Down Expand Up @@ -188,12 +186,6 @@ class KNCreateLimitOrderV2ViewController: KNBaseViewController {
self.delegate?.kCreateLimitOrderViewController(self, run: event)
}

@IBAction func learnMoreButtonTapped(_ sender: UIButton) {
KNCrashlyticsUtil.logCustomEvent(withName: "lo_learnmore", customAttributes: nil)
let url = "\(KNEnvironment.default.kyberswapURL)/faq#I-have-KNC-in-my-wallet-Do-I-get-any-discount-on-trading-fees"
self.navigationController?.openSafari(with: url)
}

@IBAction func quickFillAmountButtonTapped(_ sender: UIButton) {
self.updateEstimateFeeFromServer()
var amountDisplay = ""
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,6 @@ class LimitOrderContainerViewController: KNBaseViewController {
case 2:
pointsAndRadius = [(CGPoint(x: 102.0, y: firstPage.comparePriceLabel.frame.midY + contentOrigin.y), 111)]
case 3:
pointsAndRadius = [(CGPoint(x: firstPage.feeLabel.frame.origin.x, y: firstPage.feeLabel.frame.midY + contentOrigin.y), 72.5)]
case 4:
let bottomOffset = CGPoint(x: 0, y: firstPage.containerScrollView.contentSize.height - firstPage.containerScrollView.bounds.size.height)
if bottomOffset.y > 0 {
pointsAndRadius = [(CGPoint(x: firstPage.mainManageOrdersButton.frame.midX, y: self.view.frame.size.height - 24 - 49), 70.5)]
Expand All @@ -430,7 +428,7 @@ class LimitOrderContainerViewController: KNBaseViewController {

override func quickTutorialNextAction() {
self.dismissTutorialOverlayer()
if self.currentTutorialStep == 4 {
if self.currentTutorialStep == 3 {
let firstPage = self.pages.first
firstPage?.containerScrollView.setContentOffset(CGPoint.zero, animated: true)
NSObject.updateDoneTutorial(for: Constants.isDoneShowQuickTutorialForLimitOrderView)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,17 +316,6 @@ extension KNLimitOrderTabCoordinatorV2: LimitOrderContainerViewControllerDelegat
])
contentTopOffset = 422
case 3:
attributedString = NSMutableAttributedString(string: "Zero Fees\nIf you hold 2000 KNC in your wallet, you can make limit order trades with 0 trading fees.".toBeLocalised(), attributes: [
.font: UIFont.Kyber.regular(with: 18),
.foregroundColor: UIColor(white: 1.0, alpha: 1.0),
.kern: 0.0,
])
if let range = attributedString.string.range(of: "Zero Fees".toBeLocalised()) {
let r = NSRange(range, in: attributedString.string)
attributedString.addAttribute(.font, value: UIFont.Kyber.medium(with: 18), range: r)
}
contentTopOffset = 172
case 4:
attributedString = NSMutableAttributedString(string: "Manage Order\nCheck your order history, pending orders etc. You can modify your orders as well.".toBeLocalised(), attributes: [
.font: UIFont.Kyber.regular(with: 18),
.foregroundColor: UIColor(white: 1.0, alpha: 1.0),
Expand Down
1 change: 0 additions & 1 deletion KyberNetwork/Localization/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,6 @@
"Step 3 (optional)\nAdjust gas fees and slippage" = "Step 3 (optional)\nAdjust gas fees and slippage rate";
"Step 1\nSelect pair you want to trade" = "Step 1\nSelect pair you want to trade";
"Step 2\nSet your desired price. Press Buy/Sell and its done." = "Step 2\nSet your desired price. Press Buy/Sell and its done.";
"Zero Fees\nIf you hold 2000 KNC in your wallet, you can make limit order trades with 0 trading fees." = "Zero Fees\nIf you hold 2000 KNC in your wallet, you can make limit order trades with 0 trading fees.";
"Manage Order\nCheck your order history, pending orders etc. You can modify your orders as well." = "Manage Order\nCheck your order history, pending orders etc. You can modify your orders as well.";
"Speed Up or Cancel transaction." = "Speed Up or Cancel transaction.";

Expand Down
1 change: 0 additions & 1 deletion KyberNetwork/Localization/ko.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,6 @@
"Step 3 (optional)\nAdjust gas fees and slippage" = "3 단계 (선택사항)\n가스비와 슬리피지를 조정합니다.";
"Step 1\nSelect pair you want to trade" = "1 단계\n거래 하고자 하는 쌍(페어)를 선택합니다.";
"Step 2\nSet your desired price. Press Buy/Sell and its done." = "2 단계\n원하는 가격을 설정합니다. 매도/매수를 클릭하면 거래가 완료됩니다.";
"Zero Fees\nIf you hold 2000 KNC in your wallet, you can make limit order trades with 0 trading fees." = "수수료 없음\n지갑에 2,000KNC 이상 소유하고 있는 경우, 수수료 없이 리밋오더 거래를 만들 수 있습니다.";
"Manage Order\nCheck your order history, pending orders etc. You can modify your orders as well." = "오더(주문) 관리\n오더 내역과 펜딩 내역 등을 확인할 수 있습니다. 오더를 수정하기도 가능합니다.";
"Speed Up or Cancel transaction." = "거래 속도를 높이거나 거래를 취소할 수 있습니다.";

Expand Down
1 change: 0 additions & 1 deletion KyberNetwork/Localization/vi.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,6 @@
"Step 3 (optional)\nAdjust gas fees and slippage" = "Bước 3 (tùy chọn)\nĐiều chỉnh phí gas và tỷ lệ lệch giá";
"Step 1\nSelect pair you want to trade" = "Bước 1\nChọn cặp token bạn muốn trao đổi";
"Step 2\nSet your desired price. Press Buy/Sell and its done." = "Bước 2\nChọn giá mà bạn muốn. Bấm nút Mua / Bán để hoàn thành";
"Zero Fees\nIf you hold 2000 KNC in your wallet, you can make limit order trades with 0 trading fees." = "Không mất phí\nNếu bạn giữ 2000 KNC trong ví của bạn, bạn có thể tạo một lệnh Limit order mà không mất phí.";
"Manage Order\nCheck your order history, pending orders etc. You can modify your orders as well." = "Quản lý lệnh\nKiểm tra lịch sử lệnh, lệnh đang chờ v.v… Bạn cũng có thể thay đổi lệnh này.";
"Speed Up or Cancel transaction." = "Tăng tốc hoặc hủy giao dịch";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,6 @@
"Step 3 (optional)\nAdjust gas fees and slippage" = " 第3步骤(可选)\n调整燃料费用和滑点";
"Step 1\nSelect pair you want to trade" = "第1步骤\n选择您要交易的代币对";
"Step 2\nSet your desired price. Press Buy/Sell and its done." = "第2步骤\n设置您期望的价格。点击买/卖选项并完成。";
"Zero Fees\nIf you hold 2000 KNC in your wallet, you can make limit order trades with 0 trading fees." = "0费用\n如果您的钱包中持有2000 KNC,则使用限价订单交易时无须交易费。";
"Manage Order\nCheck your order history, pending orders etc. You can modify your orders as well." = "管理订单\n检查您的订单历史记录、待处理订单等。您也可以对订单进行修改。";
"Speed Up or Cancel transaction." = "加快交易速度或取消交易。";

Expand Down

0 comments on commit 8d84042

Please sign in to comment.