send money request changed

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard

@@ -83,7 +83,7 @@
                                                                                 <rect key="frame" x="222" y="0.0" width="125" height="73.5"/>
                                                                                 <subviews>
                                                                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="lMW-oH-k9P">
-                                                                                        <rect key="frame" x="24" y="24" width="77" height="26"/>
+                                                                                        <rect key="frame" x="25" y="24" width="75.5" height="26"/>
                                                                                         <subviews>
                                                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Korea" translatesAutoresizingMaskIntoConstraints="NO" id="MZu-Xt-o7Z">
                                                                                                 <rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
@@ -92,8 +92,8 @@
                                                                                                     <constraint firstAttribute="height" constant="26" id="i1I-Zj-NCf"/>
                                                                                                 </constraints>
                                                                                             </imageView>
-                                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="KRW" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="aYr-O8-NKb">
-                                                                                                <rect key="frame" x="36" y="0.0" width="41" height="26"/>
+                                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MNT" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="aYr-O8-NKb">
+                                                                                                <rect key="frame" x="36" y="0.0" width="39.5" height="26"/>
                                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="18"/>
                                                                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                                 <nil key="highlightedColor"/>

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

@@ -91,7 +91,9 @@ class SendMoneyExchangeRateViewController: UIViewController {
   
     private var currencyInfoViewModel: [SendMoneyExchangeRateCurrencyViewModel]? {
         didSet {
-      selectedCurrencyViewModel =  currencyInfoViewModel?.first
+            var selCountry = SendMoneyExchangeRateCurrencyViewModel()
+            selCountry.currency = "NPR"
+            selectedCurrencyViewModel =  selCountry//currencyInfoViewModel?.first
         }
     }
   
@@ -394,7 +396,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
     let senderCurrency = "MNT"
     let senderCountryId = "142"
     let reciepientAmount =  reciepientAmount.stringRemovingComma()
-    let recipientCurrency = "NPR"//selectedCurrencyViewModel?.currency
+    let recipientCurrency = selectedCurrencyViewModel?.currency
     let reciepientCountryName = "NEPAL"//reciepient?.country
     let reciepientCountryId = "151"//reciepient?.countryID
     let paymentMethod = "wallet"

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift

@@ -91,10 +91,10 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput
         "pAgent": model.bank?.id ?? "",
         
         "payOutPartner": model.paymemtMode?.payoutPartner ?? "",
-        "paymentType": model.autoDebitAccount?.type ?? "",
+        "paymentType": "wallet",
         
         "pCurr": model.exchangeRateDetail?.reciepientCurrency ?? "",
-        "collCurr": "KRW",
+        "collCurr": "MNT",
         "collAmt": model.exchangeRateDetail?.senderAmount ?? "",
         "payoutAmt": model.exchangeRateDetail?.recipientAmount ?? "",
         "transferAmt": model.exchangeRateDetail?.transferAmount ?? "",
@@ -117,8 +117,8 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput
         "isAgreed": "TRUE",
         "txnPassword": model.transactionPassword ?? "",
         "ReceiverAccountNo": model.paymemtMode?.accountNumber ?? "",
-        "KftcLogId": model.autoDebitAccount?.kftcAccountId ?? "",
-        "schemeId": model.exchangeRateDetail?.schemeId ?? "",
+        "KftcLogId": "",
+        "schemeId": "",
         "isUseBiometric": model.isUseBiometric ?? false
     ]
     

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard

@@ -3,7 +3,7 @@
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

@@ -184,8 +184,7 @@ class SendMoneyVerificationViewController: UITableViewController {
     " \(self.requestModel?.exchangeRateDetail?.reciepientCurrency ?? "")"
     
     self.exchangeRateLabel.text = self.requestModel?.exchangeRateDetail?.exchangeRate
-    
-    self.serviceChargeLabel.text = self.requestModel?.exchangeRateDetail?.discountedServiceFee
+    self.serviceChargeLabel.text = self.requestModel?.exchangeRateDetail?.transferFee
     
     self.payoutAgentBankLabel.text = self.requestModel?.bank?.name
     self.accountNoLabel.text = self.requestModel?.paymemtMode?.accountNumber