diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj
index 0ae70447..9187cc0b 100644
--- a/GME Remit.xcodeproj/project.pbxproj
+++ b/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 = "";
diff --git a/GME Remit/AppDelegate.swift b/GME Remit/AppDelegate.swift
index 91aa62e8..50b849a0 100644
--- a/GME Remit/AppDelegate.swift
+++ b/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
diff --git a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
index d06280ff..6edc6627 100644
--- a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
+++ b/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
}
}
diff --git a/GME Remit/Modules/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift b/GME Remit/Modules/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift
index 72864920..96b890b2 100644
--- a/GME Remit/Modules/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift
+++ b/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) {
diff --git a/GME Remit/Modules/RegisterModules/Register/User Interface/View/RegisterViewController.swift b/GME Remit/Modules/RegisterModules/Register/User Interface/View/RegisterViewController.swift
index 7066b62e..a559e844 100644
--- a/GME Remit/Modules/RegisterModules/Register/User Interface/View/RegisterViewController.swift
+++ b/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
}
}
diff --git a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift
index 705ad234..865037d9 100644
--- a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift
+++ b/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))"
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
index 4f9178ff..11ff5aed 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
+++ b/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 = "")
}
diff --git a/GME Remit/Modules/SideMenu/SettingViewController.swift b/GME Remit/Modules/SideMenu/SettingViewController.swift
index 4ef4dc39..3d429c33 100644
--- a/GME Remit/Modules/SideMenu/SettingViewController.swift
+++ b/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
}
}
diff --git a/GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift b/GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift
index a297bea8..8c865815 100644
--- a/GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift
+++ b/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
}
diff --git a/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/Contents.json b/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/Contents.json
index 8baef8b2..ff5c3623 100644
--- a/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/Contents.json
+++ b/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"
},
{
diff --git a/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/Webp.net-resizeimage.png b/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/Webp.net-resizeimage.png
new file mode 100644
index 00000000..b5aabb14
Binary files /dev/null and b/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/Webp.net-resizeimage.png differ
diff --git a/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/flag_ethiopia.png b/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/flag_ethiopia.png
deleted file mode 100644
index a4fe8ae0..00000000
Binary files a/GME Remit/Supported Files/Assets.xcassets/ccr/flags/flag_ethiopia.imageset/flag_ethiopia.png and /dev/null differ
diff --git a/GME Remit/Supported Files/Info.plist b/GME Remit/Supported Files/Info.plist
index 44e01142..302303c0 100644
--- a/GME Remit/Supported Files/Info.plist
+++ b/GME Remit/Supported Files/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.5.2
+ $(MARKETING_VERSION)
CFBundleURLTypes
@@ -98,6 +98,8 @@
armv7
+ UIStatusBarStyle
+ UIStatusBarStyleDarkContent
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait
@@ -109,7 +111,9 @@
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
+ UIUserInterfaceStyle
+ Light
UIViewControllerBasedStatusBarAppearance
-
+
diff --git a/GME Remit/Utilities/SwipeNavigationController.swift b/GME Remit/Utilities/SwipeNavigationController.swift
index b9032116..a7f7c338 100644
--- a/GME Remit/Utilities/SwipeNavigationController.swift
+++ b/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
diff --git a/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift b/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift
index 8c980e8b..607bff0b 100644
--- a/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift
+++ b/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)
}
}