Merge branch 'dev-swift-d' into mergeConflictSolving

GME Remit.xcodeproj/project.pbxproj

@@ -8965,6 +8965,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;
+				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",

GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Presenter/SetupRecipientPresenter.swift

@@ -66,7 +66,7 @@ extension SetupRecipientPresenter: SetupRecipientModuleInterface {
     
     func saveRecipient(at recipient: Recipient, parentType: RecipientParentType, viewcontroller: SetupRecipientViewController) {
         viewModel?.progress(isShow: true)
-        if recipient.receiverID == nil {
+        if recipient.receiverID == "" {
             interactor?.addRecipient(at: recipient)
         } else {
             self.recipient = recipient

GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift

@@ -94,7 +94,11 @@ class SetupRecipientViewController: UIViewController {
     // MARK: VC's Life cycle
     var receiverID: String? = ""
     
-    var receiver: Recipient?
+    var receiver: Recipient? {
+        didSet {
+            self.receiverID = receiver?.paymentMethod?.receiverId
+        }
+    }
     
     var setnativeCountryFirst: Bool = false
     var countryCode: String = ""
@@ -305,7 +309,7 @@ extension SetupRecipientViewController {
         
         let saveTrigger = saveButton.rx.tap.flatMap { [weak self] _ -> Observable<Recipient> in
             var recipient = Recipient()
-            
+            recipient.receiverID = recipient.paymentMethod?.receiverId
             recipient.firstName = self?.firstNameTextField.text
             recipient.middleName = self?.middleNameTextField.text
             recipient.lastName = self?.lastNameTextField.text
@@ -328,11 +332,14 @@ extension SetupRecipientViewController {
                     recipient.agent = recipients.paymentMethod?.agent
                 }
             }
+            recipient.receiverID = self?.receiverID ?? ""
+            recipient.paymentMethod?.receiverId = self?.receiverID ?? ""
 //            recipient.purposeOfRemit = self?.reasonTextField.text
 //            recipient.purposeOfRemitID = self?.reasonTextField.text
             
             
             return Observable.just(recipient)
+            
         }.asDriverOnErrorJustComplete()
         
         let input = SetupRecipientViewModel.Input(
@@ -672,7 +679,7 @@ extension SetupRecipientViewController {
     }
     
     private func setText(with recipient: Recipient?) {
-        self.receiverID = recipient?.receiverID ?? ""
+//        self.receiverID = recipient?.paymentMethod?.receiverId ?? ""
         fullNameTextField.text = recipient?.fullName?.uppercased()
         fullNameTextField.sendActions(for: .editingChanged)
         

GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift

@@ -197,7 +197,7 @@ class SetupRecipientViewModel: ViewModelType {
         let selectedNativeCountry = try? self.selectedNativeCountryLinker.value()
         
         var recipient = $0
-        recipient.receiverID = selectedRecipient?.receiverID
+//        recipient.receiverID = selectedRecipient?.receiverID
         
         recipient.country = selectedCountry?.countryName
         recipient.countryID = selectedCountry?.countryId

GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift

@@ -164,11 +164,13 @@ extension TermsAndConditionViewController: TermsAndConditionViewInterface {
             cancelTitle: "no_text".localized(),
             okAction: { [weak self] in guard let `self` = self else { return }
                 self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }
-                    self.delegate?.setupRecieientForTermsVC(
-                        self,
-                        didSelectRecipientID: self.reciepient?.receiverID ?? ""
-                    )
-                }
+                        self.delegate?.setupRecieientForTermsVC(
+                            self,
+                            didSelectRecipientID: self.reciepient?.receiverID ?? ""
+                        )
+
+                    
+                    }
             },
             cancelAction: { [weak self] in guard let `self` = self else { return }
                 self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }