diff --git a/GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift b/GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift index 44ef5c0b..8f0da63f 100644 --- a/GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift +++ b/GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift @@ -185,10 +185,10 @@ extension HomeCollectionTableViewCell: UICollectionViewDelegate { return Notification.Name.init(rawValue: MenuNotificationName.todaysRate) } func getTrackYourTransferNotificationName() -> Notification.Name { - return Notification.Name.init(rawValue: MenuNotificationName.resend) + return Notification.Name.init(rawValue: MenuNotificationName.transactionStatement) } func getResendNotificationName() -> Notification.Name { - return Notification.Name.init(rawValue: MenuNotificationName.transactionStatement) + return Notification.Name.init(rawValue: MenuNotificationName.resend) } func getWalletToWalletNotificationName() -> Notification.Name { return Notification.Name.init(rawValue: MenuNotificationName.walletToWallet) diff --git a/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift b/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift index 4071d722..456222b8 100644 --- a/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift +++ b/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift @@ -181,12 +181,18 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout { NotificationCenter.default.addObserver(self, selector: #selector(self.showSideMenuSupport), name: self.getSupportNotificationName(), object: nil) NotificationCenter.default.addObserver(self, selector: #selector(self.showSideMenuSetting), name: self.getSettingNotificationName(), object: nil) + + NotificationCenter.default.addObserver(self, selector: #selector(self.showTransactionStatement), name: self.getTransactionHistoryNotificationName(), object: nil) } private func getAboutMeNotificationName() -> Notification.Name { return Notification.Name.init(SideMenuNavigationNotifications.aboutGme) } + private func getTransactionHistoryNotificationName() -> Notification.Name { + return Notification.Name.init(SideMenuNavigationNotifications.transactionHistory) + } + private func getSupportNotificationName() -> Notification.Name { return Notification.Name.init(SideMenuNavigationNotifications.support) } @@ -306,9 +312,9 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout { center.addObserver(self, selector: #selector(self.showSendMoney), name: self.getSendMoneyNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.showMobileRecharge), name: self.getMobileRechargeNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.showTodaysRate), name: self.getTodaysRateNotificationName(), object: nil) - center.addObserver(self, selector: #selector(self.showTrackYourTransfer), name: self.getTrackYourTransferNotificationName(), object: nil) - center.addObserver(self, selector: #selector(self.showTransactionStatement), name: self.getTransactionStatementNotificationName(), object: nil) - center.addObserver(self, selector: #selector(self.showResendMoney), name: self.getWalletToWalletNotificationName(), object: nil) + center.addObserver(self, selector: #selector(self.showResendMoney), name: self.getTrackYourTransferNotificationName(), object: nil) + center.addObserver(self, selector: #selector(self.showTrackYourTransfer), name: self.getTransactionStatementNotificationName(), object: nil) +// center.addObserver(self, selector: #selector(self.showResendMoney), name: self.getWalletToWalletNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.setupHeight(sender:)), name: self.getCollectionHeightNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.showUnVerifiedMessage), name: self.getMainControllerNotificationName(), object: nil) diff --git a/GMERemittance/Module/Home/User Interface/Wireframe/HomeWireframe.swift b/GMERemittance/Module/Home/User Interface/Wireframe/HomeWireframe.swift index 399063bc..1b3d2fc6 100644 --- a/GMERemittance/Module/Home/User Interface/Wireframe/HomeWireframe.swift +++ b/GMERemittance/Module/Home/User Interface/Wireframe/HomeWireframe.swift @@ -19,7 +19,7 @@ class HomeWireframe { private lazy var pennyTestWireFrame = PennyTestWireframe() private lazy var pennyTestSubmitWireFrame = PennyTestSubmitWireframe() private lazy var appUpdateWireFrame = AppUpdateWireframe() - private lazy var resendWireframe: ResendWireframe = ResendWireframe() +// private lazy var resendWireframe: ResendWireframe = ResendWireframe() } extension HomeWireframe: HomeWireframeInput { @@ -44,8 +44,7 @@ extension HomeWireframe: HomeWireframeInput { func openTransactionHistory() { if let navigation = self.view.navigationController { -// self.transactionHistoryWireframe.pushMainView(in: navigation) - self.resendWireframe.pushMainView(in: navigation) + self.transactionHistoryWireframe.pushMainView(in: navigation) } } diff --git a/GMERemittance/SideMenu/SideMenu.storyboard b/GMERemittance/SideMenu/SideMenu.storyboard index 220cac16..4390acc0 100644 --- a/GMERemittance/SideMenu/SideMenu.storyboard +++ b/GMERemittance/SideMenu/SideMenu.storyboard @@ -295,7 +295,7 @@ - + diff --git a/GMERemittance/SideMenu/SideMenuViewController.swift b/GMERemittance/SideMenu/SideMenuViewController.swift index 488d2a53..6f7202f3 100644 --- a/GMERemittance/SideMenu/SideMenuViewController.swift +++ b/GMERemittance/SideMenu/SideMenuViewController.swift @@ -18,6 +18,7 @@ struct SideMenuNavigationNotifications { static let availableBalance = "Available_Balance" static let withdraw = "withdraw" static let KftcAccountList = "KftcAccountList" + static let transactionHistory = "transaction_History_from_sidemenu" } @@ -136,6 +137,10 @@ class SideMenuViewController: UIViewController { NotificationCenter.default.post(name: self.getWithdrawNotificationName(), object: nil, userInfo: nil) } + @IBAction func openTransactionHistory(_ sender: Any) { + self.sideMenuController?.hideLeftView() + NotificationCenter.default.post(name: self.getTransactionHistoryNotificationName(), object: nil, userInfo: nil) + } @IBAction func openKftcAccountList(_ sender: UIButton) { self.sideMenuController?.hideLeftView() @@ -244,6 +249,10 @@ class SideMenuViewController: UIViewController { return Notification.Name.init(SideMenuNavigationNotifications.withdraw) } + func getTransactionHistoryNotificationName() -> Notification.Name { + return Notification.Name.init(SideMenuNavigationNotifications.transactionHistory) + } + func getKftcAccountListNotificationName() -> Notification.Name { return Notification.Name.init(SideMenuNavigationNotifications.KftcAccountList)