From 74d2d91515adbb6980cce86140355b21c2b57af6 Mon Sep 17 00:00:00 2001 From: gme_2 Date: Wed, 10 Oct 2018 15:09:29 +0900 Subject: [PATCH] bug fixed --- GMERemittance.xcodeproj/project.pbxproj | 4 ++-- .../User Interface/View/MessageCompose.storyboard | 4 ++-- .../View/MessageComposeViewController.swift | 13 +++++++++---- .../User Interface/View/kycForm3.storyboard | 2 +- .../User Interface/View/SendMoneyReceipt.storyboard | 4 ++-- .../View/TransactionHistory.storyboard | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/GMERemittance.xcodeproj/project.pbxproj b/GMERemittance.xcodeproj/project.pbxproj index ac70e55f..5d949cf2 100644 --- a/GMERemittance.xcodeproj/project.pbxproj +++ b/GMERemittance.xcodeproj/project.pbxproj @@ -308,6 +308,7 @@ D92B802D2140C3CB00A25B26 /* MainViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D92B80232140C3CB00A25B26 /* MainViewInterface.swift */; }; D92B802E2140C3CB00A25B26 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D92B80242140C3CB00A25B26 /* MainViewController.swift */; }; D92C24A721477EA600F6876F /* ResponseMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D92C24A621477EA600F6876F /* ResponseMessage.swift */; }; + D931E22A216DCC2A008A8CD1 /* MessageCompose.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D9DC107721639077008F3C51 /* MessageCompose.storyboard */; }; D93702AE2148EE6C00D93077 /* KycModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D937029B2148EE6C00D93077 /* KycModuleInterface.swift */; }; D93702AF2148EE6C00D93077 /* KycService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D937029E2148EE6C00D93077 /* KycService.swift */; }; D93702B02148EE6C00D93077 /* KycServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D937029F2148EE6C00D93077 /* KycServiceType.swift */; }; @@ -518,7 +519,6 @@ D9DC107F21639078008F3C51 /* MessageComposeWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9DC107221639077008F3C51 /* MessageComposeWireframe.swift */; }; D9DC108021639078008F3C51 /* MessageComposeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9DC107521639077008F3C51 /* MessageComposeViewController.swift */; }; D9DC108121639078008F3C51 /* MessageComposeViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9DC107621639077008F3C51 /* MessageComposeViewInterface.swift */; }; - D9DC108221639078008F3C51 /* MessageCompose.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D9DC107721639077008F3C51 /* MessageCompose.storyboard */; }; D9DC108421639E56008F3C51 /* SuccessMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9DC108321639E56008F3C51 /* SuccessMessage.swift */; }; D9E57945212E938D00D47AC0 /* ExchangeRateDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9E57944212E938D00D47AC0 /* ExchangeRateDetailModel.swift */; }; EBFC1719B80F43F88EB01F69 /* Pods_GMERemittanceTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0380AEB198AADC0BC4394515 /* Pods_GMERemittanceTests.framework */; }; @@ -3997,7 +3997,7 @@ D945F127213E1D5100A24824 /* SendMoneyReceipt.storyboard in Resources */, D950BED921549242008367A1 /* Home.storyboard in Resources */, D9622317212BE3DC00B7A115 /* TableViewPicker.storyboard in Resources */, - D9DC108221639078008F3C51 /* MessageCompose.storyboard in Resources */, + D931E22A216DCC2A008A8CD1 /* MessageCompose.storyboard in Resources */, 5565FF2C1FE275E5002934E9 /* SanFranciscoText-Medium.otf in Resources */, 5565FF311FE275E5002934E9 /* SanFranciscoDisplay-Medium.otf in Resources */, 9F8FEF101FEE2D9F00CE550F /* RecipientListViewController.storyboard in Resources */, diff --git a/GMERemittance/Module/MessageCompose/User Interface/View/MessageCompose.storyboard b/GMERemittance/Module/MessageCompose/User Interface/View/MessageCompose.storyboard index b24e218b..1598ecf3 100644 --- a/GMERemittance/Module/MessageCompose/User Interface/View/MessageCompose.storyboard +++ b/GMERemittance/Module/MessageCompose/User Interface/View/MessageCompose.storyboard @@ -21,7 +21,7 @@ - + @@ -140,7 +140,7 @@ - + diff --git a/GMERemittance/Module/MessageCompose/User Interface/View/MessageComposeViewController.swift b/GMERemittance/Module/MessageCompose/User Interface/View/MessageComposeViewController.swift index d404a3c6..79a89e26 100644 --- a/GMERemittance/Module/MessageCompose/User Interface/View/MessageComposeViewController.swift +++ b/GMERemittance/Module/MessageCompose/User Interface/View/MessageComposeViewController.swift @@ -30,6 +30,11 @@ class MessageComposeViewController: UIViewController { self.setup() } + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + self.setupNormalNavigation() + self.navigationItem.title = "Support" + } // MARK: IBActions @@ -51,6 +56,8 @@ class MessageComposeViewController: UIViewController { textViewMessage.layer.borderColor = UIColor.lightGray.cgColor textViewMessage.layer.backgroundColor = UIColor.white.cgColor textViewMessage.delegate = self + let barbutton = UIBarButtonItem.init(image: #imageLiteral(resourceName: "backIconBlack"), style: .plain, target: self, action: #selector(self.cancelMessage(_:))) + self.navigationItem.leftBarButtonItem = barbutton setupSubject() } @@ -60,7 +67,7 @@ class MessageComposeViewController: UIViewController { case .cancel: self.textFieldSubject.text = "Request For Cancellation" case .edit: - self.textFieldSubject.text = "Request For Ammendment" + self.textFieldSubject.text = "Request For Amendment" } } @@ -83,9 +90,7 @@ class MessageComposeViewController: UIViewController { } } } - - - + } // MARK: MessageComposeViewInterface diff --git a/GMERemittance/Module/New Group/kycForm3/User Interface/View/kycForm3.storyboard b/GMERemittance/Module/New Group/kycForm3/User Interface/View/kycForm3.storyboard index 5cfbcd32..0f7fe22d 100644 --- a/GMERemittance/Module/New Group/kycForm3/User Interface/View/kycForm3.storyboard +++ b/GMERemittance/Module/New Group/kycForm3/User Interface/View/kycForm3.storyboard @@ -174,7 +174,7 @@ -