edit TablePresenter cancel action ( set nil )

GME Remit.xcodeproj/project.pbxproj

@@ -15203,6 +15203,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
 				);
+				MARKETING_VERSION = 2.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gme.gmeremit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -15236,6 +15237,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
 				);
+				MARKETING_VERSION = 2.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gme.gmeremit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

GME Remit/AppDelegate.swift

@@ -20,7 +20,7 @@ import IQKeyboardManagerSwift
 import Localize_Swift
 import ChannelIO
 
-let server: Server = .live
+let server: Server = .uat
 var overlayView: UIView?
 
 @UIApplicationMain

GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift

@@ -538,6 +538,6 @@ extension ExchangeRatesViewController: TablePresenterDelegate {
     ) {
     showExchangeRateInfomation(isHidden: true)
     selectedPaymentModeIndex = 0
-    selectedExchangeRateModel = model as? ExchangeRateModel
+    selectedExchangeRateModel = (model as? ExchangeRateModel) ?? selectedExchangeRateModel
   }
 }

GME Remit/Modules/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift

@@ -191,7 +191,6 @@ class KycForm1ViewController: UIViewController {
     self.view.endEditing(true)
   }
   
-  
   // MARK: IBActions
   
   @IBAction func save(_ sender: UIButton) {

GME Remit/Modules/RegisterModules/Register/User Interface/View/RegisterViewController.swift

@@ -318,6 +318,6 @@ extension RegisterViewController: TablePresenterDelegate {
     _ viewController: TablePresenterViewController,
     didSelectModel model: TablePresenterProtocol?
   ) {
-    selectedNativeCountry = model as? NativeCountryModel
+    selectedNativeCountry = (model as? NativeCountryModel) ?? selectedNativeCountry
   }
 }

GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift

@@ -166,7 +166,10 @@ extension DomesticRemitViewController {
       .drive(onNext: {
         guard
           let name = $0?.bankName,
-          let account = $0?.accountNumMasked else { return }
+          let account = $0?.accountNumMasked else {
+            self.autoDebitTextField.text = ""
+            return
+        }
         
         self.autoDebitTextField.text = "\(name) (\(account))"
         

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

@@ -519,7 +519,8 @@ extension SendMoneyExchangeRateViewController: TablePresenterDelegate {
     _ viewController: TablePresenterViewController,
     didSelectModel model: TablePresenterProtocol?
   ) {
-    selectedCurrencyViewModel = model as? SendMoneyExchangeRateCurrencyViewModel
+    selectedCurrencyViewModel =
+      (model as? SendMoneyExchangeRateCurrencyViewModel) ?? selectedCurrencyViewModel
     
     calcBy.lowercased() == "c" ? (reciepientTextField.text = "") : (senderTextField.text = "")
   }

GME Remit/Modules/SideMenu/SettingViewController.swift

@@ -169,7 +169,7 @@ extension SettingViewController: TablePresenterDelegate {
     _ viewController: TablePresenterViewController,
     didSelectModel model: TablePresenterProtocol?
   ) {
-    self.selectedLanguage = model as? SendMoneyCountryViewModel
+    self.selectedLanguage = (model as? SendMoneyCountryViewModel) ?? self.selectedLanguage
   }
   
 }

GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift

@@ -478,10 +478,10 @@ extension SplashScreenViewController: TablePresenterDelegate {
   ) {
     switch viewController.view.tag {
     case 0:
-      selectedLanguage = model as? SendMoneyCountryViewModel
+      selectedLanguage = (model as? SendMoneyCountryViewModel) ?? selectedLanguage
     case 1:
       showExchangeRateInfomation(isHidden: true)
-      selectedExchangeRateModel = model as? ExchangeRateModel
+      selectedExchangeRateModel = (model as? ExchangeRateModel) ?? selectedExchangeRateModel
     default: break
       
     }

GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "flag_ethiopia.png",
+      "filename" : "Webp.net-resizeimage.png",
       "scale" : "1x"
     },
     {

GME Remit/Supported Files/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -98,6 +98,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleDarkContent</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -109,7 +111,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<true/>
 </dict>
 </plist>

GME Remit/Utilities/SwipeNavigationController.swift

@@ -14,6 +14,7 @@ class SwipeNavigationController: UINavigationController {
   
   override init(rootViewController: UIViewController) {
     super.init(rootViewController: rootViewController)
+    delegate = self
   }
   
   override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
@@ -57,8 +58,11 @@ class SwipeNavigationController: UINavigationController {
 // MARK: - UINavigationControllerDelegate
 
 extension SwipeNavigationController: UINavigationControllerDelegate {
-  
-  func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
+  func navigationController(
+    _ navigationController: UINavigationController,
+    didShow viewController: UIViewController,
+    animated: Bool
+) {
     guard let swipeNavigationController = navigationController as? SwipeNavigationController else { return }
     
     swipeNavigationController.duringPushAnimation = false

GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift

@@ -109,6 +109,7 @@ class TablePresenterViewController: UIViewController {
   @IBAction func touchCloseButton(_ sender: UIButton) {
     presentingViewController?.view.endEditing(true)
     mainView.originToBottom {
+      self.delegate?.tablePresenterView(self, didSelectModel: nil)
       self.dismiss(animated: true)
     }
   }