From c5afa3eb3fc670a46447420b86fcacd900736055 Mon Sep 17 00:00:00 2001 From: "stepie.ub" Date: Thu, 29 Jun 2023 09:49:28 +0545 Subject: [PATCH] pushed to live --- GME Remit.xcodeproj/project.pbxproj | 6 ++---- .../User Interface/View/Custom/HomeExchangeRateView.swift | 1 + .../User Interface/View/RecipientsViewController.swift | 3 ++- .../Interactor/SendMoneyVerificationInteractor.swift | 2 +- .../Interactor/TermsAndConditionInteractor.swift | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index aefc8ff0..304f158a 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -8884,7 +8884,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=*]" = arm64; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; @@ -8916,7 +8915,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; @@ -8962,12 +8961,11 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit/GME RemitRelease.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; - "EXCLUDED_ARCHS[sdk=*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", diff --git a/GME Remit/Modules/Home/User Interface/View/Custom/HomeExchangeRateView.swift b/GME Remit/Modules/Home/User Interface/View/Custom/HomeExchangeRateView.swift index a95c0364..0147f822 100644 --- a/GME Remit/Modules/Home/User Interface/View/Custom/HomeExchangeRateView.swift +++ b/GME Remit/Modules/Home/User Interface/View/Custom/HomeExchangeRateView.swift @@ -277,6 +277,7 @@ class HomeExchangeRateView: UIView { recivedMoneyView.didSelectCountry = { [weak self] in self?.sendMoneyView.resignFirstResponder() self?.recivedMoneyView.resignFirstResponder() + self?.selectedPaymentModeIndex = 0 self?.openCountryList?() } diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift index 052cfded..a80a4c0b 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift @@ -276,6 +276,7 @@ extension RecipientsViewController { onNext: { [weak self] in guard let `self` = self else { return } self.model = $0 self.collectionView.reloadData() +// self.tableView.reloadData() } ).disposed(by: disposeBag) @@ -430,7 +431,7 @@ extension RecipientsViewController: UITableViewDelegate { // } //} -extension RecipientsViewController: UICollectionViewDelegate, UICollectionViewDataSource { +extension RecipientsViewController: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout { func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { let count = self.model?.count ?? 0 diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift index ef78a631..4112873f 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift @@ -85,7 +85,7 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput "SenderId": senderId ?? "", "ReceiverId": recieverId ?? "", "DeliveryMethodId": model.paymemtMode?.id ?? "", - "PBranch": reciepient.paymentMethod?.agent?.id ?? "", + "PBranch": reciepient.paymentMethod?.agent?.branch?.id ?? "", "PAgent": model.bank?.id ?? "", "PaymentType": "wallet", "PCurr": model.exchangeRateDetail?.reciepientCurrency ?? "", diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift index f6a8ecaf..e53a12d6 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift @@ -119,7 +119,7 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput { "SenderId": senderId ?? "", "ReceiverId": receiverID, "DeliveryMethodId": paymentModel?.id ?? "", - "PBranch": paymentModel?.agent?.id ?? reciepient.agent?.id ?? "", + "PBranch": reciepient.paymentMethod?.agent?.branch?.id ?? "", "PAgent": paymentModel?.agent?.id ?? reciepient.agent?.id ?? "", "PaymentType": "wallet", "PCurr": paymentModel?.currency?.first ?? "",