setup

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

@@ -293,7 +293,6 @@ 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
@@ -307,7 +306,6 @@ extension SetupRecipientViewController {
             recipient.email = self?.emailTextField.text
             recipient.mobile = self?.mobileTextField.mobileNumberText
             recipient.idNumber = self?.idNumberTextField.text
-            recipient.agent?.accountNumber = self?.accountTextField.text
             //changes made for "others"
             recipient.relationship = self?.relationTextField.text
             recipient.relationshipID = self?.relationTextField.text
@@ -318,6 +316,8 @@ extension SetupRecipientViewController {
             }
             recipient.receiverID = self?.receiverID ?? ""
             recipient.paymentMethod?.receiverId = self?.receiverID ?? ""
+            recipient.agent?.accountNumber = self?.accountTextField.text
+            print("number::\(recipient)")
 //            recipient.purposeOfRemit = self?.reasonTextField.text
 //            recipient.purposeOfRemitID = self?.reasonTextField.text