exchange rate calculate fix

GMERemittance/AppDelegate.swift

@@ -140,20 +140,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any],
                      fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         
-        if userInfo[gcmMessageIDKey] != nil {
-//            print("Message ID completionHandler: \(messageID)")
-        }
-
-        if
-            let aps = userInfo["aps"] as? NSDictionary,
-            let alert = aps["alert"] as? NSDictionary,
-            let _ = alert["body"] as? String,
-            let _ = alert["title"] as? String {
-            let codeID = userInfo["code"] as? String
-            self.redirectWithPushNotification(notificationCode: codeID!)
-        }
+//        if userInfo[gcmMessageIDKey] != nil {
+////            print("Message ID completionHandler: \(messageID)")
+//        }
+//
+//        if
+//            let aps = userInfo["aps"] as? NSDictionary,
+//            let alert = aps["alert"] as? NSDictionary,
+//            let _ = alert["body"] as? String,
+//            let _ = alert["title"] as? String {
+//            let codeID = userInfo["code"] as? String
+//            self.redirectWithPushNotification(notificationCode: codeID!)
+//        }
         
-        completionHandler(UIBackgroundFetchResult.newData)
+//        completionHandler(UIBackgroundFetchResult.newData)
     }
     
     func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String) {

GMERemittance/Module/AppUpdate/User Interface/View/AppUpdateViewController.swift

@@ -11,9 +11,9 @@ import UIKit
 class AppUpdateViewController: UIViewController {
     
     struct StringConstants {
-        static let updateMessageText = "New update is available"
-        static let updateText = "Update"
-        static let notNowText = "Not Now"
+        static let updateMessageText = "new_update_is_available_text".localized()
+        static let updateText = "update_text".localized()
+        static let notNowText = "not_now_text".localized()
     }
     
     // MARK: Properties

GMERemittance/Module/Auto refund/AutoRefundsViewController.swift

@@ -11,12 +11,12 @@ import UIKit
 class AutoRefundsViewController: UIViewController {
     
     struct  StringConstants {
-        static let headerTitleText =  "HOW MUCH WOULD YOU LIKE TO REFUND?"
-        static let availableBalanceTitleText = "AVAILABLE BALANCE : "
-        static let refundChargeTitleTxty = "PRE REFUND BANK CHARGE : "
-        static let navigationTitle =  "Auto Refund "
-        static let yourRefundText = "You Refund"
-        static let refundButtonText = "Refund"
+        static let headerTitleText =  "how_much_would_you_like_to_refund".localized()
+        static let availableBalanceTitleText = "available_balance_text".localized()
+        static let refundChargeTitleTxty = "per_refund_bank_charge".localized()
+        static let navigationTitle =  "auto_refund_title_text".localized()
+        static let yourRefundText = "you_refund_text".localized()
+        static let refundButtonText = "refund_text".localized()
     }
     
     
@@ -57,8 +57,8 @@ class AutoRefundsViewController: UIViewController {
     }
     
     private func configureText() {
-        self.availableBalanceTitleLabel.text = StringConstants.availableBalanceTitleText
-        self.refundChargeLabel.text = StringConstants.refundChargeTitleTxty
+        self.availableBalanceTitleLabel.text = StringConstants.availableBalanceTitleText + " : "
+        self.refundChargeLabel.text = StringConstants.refundChargeTitleTxty + " : "
         self.yourRefundLabel.text = StringConstants.yourRefundText
         self.refundButton.setTitle(StringConstants.refundButtonText, for: UIControlState.normal)
     }

GMERemittance/Module/AutoDebit/User Interface/View/AutoDebitViewController.swift

@@ -11,16 +11,16 @@ import UIKit
 class AutoDebitViewController: UIViewController {
     
     struct StringConstants {
-        static let navigationTitle = "Manage Auto Debit Account"
-        static let languageUnavailableError = "No Lanugages Available"
-        static let pickerTitle = "Select Language"
-        static let cancelText = "Cancel"
-        static let deleteTitleText = "You want to delete Auto-Debit Account!"
-        static let confirmationText = "Are you sure?"
-        static let deleteText = "Delete"
-        static let editText = "Edit"
-        static let addAccountText = "Add Auto Debit Account"
-        static let swipeInfoText = "Swipe left to “Edit” or “Delete” account."
+        static let navigationTitle = "auto_debit_title_text".localized()
+        static let languageUnavailableError = "no_lanugages_available_text".localized()
+        static let pickerTitle = "select_language_text".localized()
+        static let cancelText = "cancel_text".localized()
+        static let deleteTitleText = "auto_debit_delete_confirm_description".localized()
+        static let confirmationText = "are_you_sure_text".localized()
+        static let deleteText = "delete_text".localized()
+        static let editText = "Edit".localized()
+        static let addAccountText = "add_auto_debit_account_text".localized()
+        static let swipeInfoText = "swift_to_delete_account_text".localized()
     }
     
     // MARK:- IBOutlets

GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift

@@ -189,9 +189,10 @@ class ExchangeRatesViewController: UIViewController {
         
         if shouldShowLoading { self.showProgressHud() }
         self.getExchangeRateInformation(params: param, success: { (exchageRateDetail) in
-            self.senderTextField.text = Utility.getCommaSeperatedStringWithDecimal(numberString: exchageRateDetail?.senderAmount ?? "")
-            self.reciepientTextField.text = Utility.getCommaSeperatedStringWithDecimal(numberString: exchageRateDetail?.recipientAmount ?? "")
             
+            self.reciepientTextField.text = Utility.getCommaSeperatedStringWithDecimal(numberString: exchageRateDetail?.recipientAmount ?? "")
+            self.senderTextField.text = Utility.getCommaSeperatedStringWithDecimal(numberString: exchageRateDetail?.senderAmount ?? "")
+            self.calcBy = "c"
             let transferFee = exchageRateDetail?.transferFee ?? ""
             let currency = exchageRateDetail?.senderCurrency ?? ""
             

GMERemittance/Module/Login/User Interface/View/LoginViewController.swift

@@ -64,7 +64,7 @@ class LoginViewController: UIViewController {
     }
     
     private func configureLanguage() {
-        Localize.setCurrentLanguage("th")
+        Localize.setCurrentLanguage("en")
         self.headerTitle.text = StringConstants.headerTitle
         self.subtitle.text = StringConstants.subHeaderTitle
         self.userIdTitleLabel.text = StringConstants.userIdTitle

GMERemittance/Module/MessageCompose/User Interface/View/MessageComposeViewController.swift

@@ -12,7 +12,7 @@ class MessageComposeViewController: UIViewController {
     
     struct StringConstants {
         static let headerText = "We are always there to help you."
-        static let submitText = "Submit"
+        static let submitText = "submit_text"
         static let cancelText = "Cancel"
         static let subjectAmendmentText = "Request For Amendment"
         static let subjectCancelText = "Request For Cancellation"

GMERemittance/Module/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift

@@ -11,7 +11,8 @@ import UIKit
 class PaymentSelectionViewController: UIViewController {
     
     struct StringConstants {
-        static let closeText = "Close"
+        // Todo ccr
+        static let closeText = "penny_test_close_text".localized()
     }
     
     // MARK: IBOutlets

GMERemittance/Module/PennyTest/User Interface/View/PennyTestViewController.swift

@@ -11,8 +11,8 @@ import UIKit
 class PennyTestViewController: UIViewController {
     
     struct StringConstants {
-        static let proceedText = "Proceed"
-        static let notNowText = "Not Now"
+        static let proceedText = "proceed_text".localized()
+        static let notNowText = "not_now_text".localized()
     }
     
     // MARK: Properties

GMERemittance/Module/PennyTestSubmit/User Interface/View/PennyTestSubmitViewController.swift

@@ -14,12 +14,12 @@ import FirebaseInstanceID
 class PennyTestSubmitViewController: UIViewController {
     
     struct StringConstants {
-        static let navigationTitle = "Penny Test"
-        static let depositReferenceText = "Deposit Reference"
-        static let viewSampleText = "View Sample"
-        static let resendRequestText = "Resend Request"
-        static let submitText = "Submit"
-        static let notNowText = "Not Now"
+        static let navigationTitle = "penny_test_title_text".localized()
+        static let depositReferenceText = "deposit_reference_text".localized()
+        static let viewSampleText = "view_sample_text".localized()
+        static let resendRequestText = "resend_request_text".localized()
+        static let submitText = "submit_text".localized()
+        static let notNowText = "not_now_text".localized()
     }
     
     // MARK: Properties

GMERemittance/Module/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift

@@ -11,9 +11,9 @@ import UIKit
 class WalletStatementTableViewCell: UITableViewCell {
 
     struct StringConstants {
-        static let _in = "IN"
-        static let out = "OUT"
-        static let closingBalanceText = "Closing Balance"
+        static let _in = "in_text".localized()
+        static let out = "out_text".localized()
+        static let closingBalanceText = "closing_balance_text".localized()
     }
     
     enum WalletInOutType: String {

GMERemittance/Module/WalletStatement/User Interface/View/WalletStatementViewController.swift

@@ -16,8 +16,8 @@ enum WalletStatementType {
 class WalletStatementViewController: UIViewController {
     
     struct StringConstants {
-        static let navigationTitle = "Wallet Statement"
-        static let emptyMessage = "No Wallet Statements Found"
+        static let navigationTitle = "wallet_statement_title_text".localized()
+        static let emptyMessage = "no_statement_found_text".localized()
     }
     
     // MARK: IBOutlets