diff --git a/GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift b/GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift index 4a4383c1..378e03d4 100644 --- a/GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift +++ b/GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift @@ -65,12 +65,12 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow let trackTransferMenu = HomeCollectionModel() trackTransferMenu.index = 3 - trackTransferMenu.title = "Track Your Transfer" + trackTransferMenu.title = "GME Wallet Statement" trackTransferMenu.icon = #imageLiteral(resourceName: "track-transfer") let transactionStatementMenu = HomeCollectionModel() transactionStatementMenu.index = 4 - transactionStatementMenu.title = "Transaction Statement" + transactionStatementMenu.title = "Transaction Report" transactionStatementMenu.icon = #imageLiteral(resourceName: "transaction-statement") let walletToWalletMenu = HomeCollectionModel() @@ -78,7 +78,7 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow walletToWalletMenu.title = "Wallet to Wallet Transfer" walletToWalletMenu.icon = #imageLiteral(resourceName: "wallet-transfer") - self.menus = [sendMoneyMenu, toadaysRateMenu, trackTransferMenu, transactionStatementMenu] + self.menus = [sendMoneyMenu, toadaysRateMenu, transactionStatementMenu, trackTransferMenu] } override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { diff --git a/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift b/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift index 15d7124b..d99e6f67 100644 --- a/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift +++ b/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift @@ -44,9 +44,8 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - self.setupPicturedNavBar() + configureViews() self.setActionBarIcons(showNotificationParameter: false) // set true if there is unread notification - self.showUnverifiedNotice() } override func viewWillDisappear(_ animated: Bool) { @@ -56,7 +55,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout { // MARK: IBActions @IBAction func closeVerificationNotice(_ sender: UIButton) { - + return let animator = UIViewPropertyAnimator(duration: 0.4, curve: .easeOut ) animator.addAnimations { self.verificationNoticeView.alpha = 0 @@ -76,7 +75,6 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout { private func setup() { // all setup should be done here setupDelegates() - configureViews() setupNotifications() } @@ -165,11 +163,14 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout { private func showUnverifiedNotice() { if !self.isUserVerified() { - self.verificationNoticeHeightConstraint.constant = Constants.verificationNoticeHeight UIView.animate(withDuration: 0.33) { + self.verificationNoticeHeightConstraint.constant = Constants.verificationNoticeHeight self.verificationNoticeView.alpha = 1 self.view.layoutIfNeeded() } + }else { + self.verificationNoticeHeightConstraint.constant = 0 + self.view.layoutIfNeeded() } } @@ -189,7 +190,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout { } private func isUserVerified() -> Bool { - return false +// return false let val = (UserDefaults.standard.object(forKey: UserKeys.verified) as? Bool ) ?? false print(val) return val @@ -260,7 +261,8 @@ extension HomeViewController: UITableViewDelegate { let totalHeight = view.frame.height let ramainingBalanceCellHeight: CGFloat = 100 let finalHeight = totalHeight - ramainingBalanceCellHeight - return self.menuHeight ?? finalHeight + return finalHeight +// return self.menuHeight ?? finalHeight } } }