From 5f5ee27827182289382d0f08c64137ee24058799 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 24 May 2019 15:13:10 +0900 Subject: [PATCH] when transaction money, chage activity inticator base parent. viewcontroller -> viewcontroller's root( tabbarcontroller ) --- .../View/Cell/RewardItemCollectionViewCell.swift | 2 +- .../User Interface/View/SendMoneyParentViewController.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift b/GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift index e0eaa0ac..cfce398e 100644 --- a/GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift +++ b/GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift @@ -56,7 +56,7 @@ class RewardItemCollectionViewCell: UICollectionViewCell { let totalPoint = UserDefaults.standard.integer(forKey: UserKeys.rewardPoint) - let isEnable = totalPoint > Int(self.model?.pointPrice ?? "") ?? 0 + let isEnable = totalPoint >= Int(self.model?.pointPrice ?? "") ?? 0 self.redeemButton.backgroundColor = isEnable ? AppConstants.themeRedColor : .lightGray self.redeemButton.isEnabled = isEnable diff --git a/GMERemittance/Module/SendMoney/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift index f9a21c21..d97bb410 100644 --- a/GMERemittance/Module/SendMoney/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift +++ b/GMERemittance/Module/SendMoney/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift @@ -297,11 +297,11 @@ extension SendMoneyParentViewController: SendMoneyParentViewInterface { extension SendMoneyParentViewController: HUDStatusDelegate { func showLoading() { - self.showProgressHud() + self.tabBarController?.showProgressHud() } func hideLoading() { - self.hideProgressHud() + self.tabBarController?.hideProgressHud() } }