diff --git a/GMERemittance/Model/Reciepient.swift b/GMERemittance/Model/Reciepient.swift
index c731797c..0ad23d5f 100644
--- a/GMERemittance/Model/Reciepient.swift
+++ b/GMERemittance/Model/Reciepient.swift
@@ -97,8 +97,8 @@ struct Recipient: Codable, Mappable {
     reasonId <- map["reasonId"]
     countryId <- map["countryId"]
     countryCode <- map["countryCode"]
-    idNumber <- map["IdNumber"]
-    idType <- map["IdType"]
+    idNumber <- map["idNumber"]
+    idType <- map["idType"]
     
   }
   
diff --git a/GMERemittance/Model/SendMoneyCountryModel.swift b/GMERemittance/Model/SendMoneyCountryModel.swift
index f5e87409..28d9d34d 100644
--- a/GMERemittance/Model/SendMoneyCountryModel.swift
+++ b/GMERemittance/Model/SendMoneyCountryModel.swift
@@ -11,121 +11,138 @@ import ObjectMapper
 
 
 class District: Mappable {
-    var id: String?
-    var name: String?
-    
-    required init?(map: Map) {
-        
-    }
-    
-    func mapping(map: Map) {
-        id <- map["id"]
-        name <- map["text"]
-    }
-    
+  var id: String?
+  var name: String?
+  
+  required init?(map: Map) {
+    
+  }
+  
+  func mapping(map: Map) {
+    id <- map["id"]
+    name <- map["text"]
+  }
+  
 }
 
 class Provience: Mappable {
-    var id: String?
-    var name: String?
-    var districts: [District]?
-    
-    required init?(map: Map) {
-        
-    }
-    
-    func mapping(map: Map) {
-        id <- map["id"]
-        name <- map["text"]
-        districts <- map["District"]
-    }
+  var id: String?
+  var name: String?
+  var districts: [District]?
+  
+  required init?(map: Map) {
+    
+  }
+  
+  func mapping(map: Map) {
+    id <- map["id"]
+    name <- map["text"]
+    districts <- map["District"]
+  }
 }
 
 
 class CountryModel: Mappable {
-    var name: String?
-    var id: String?
-    var provienceRequired: String?
-    var code: String?
-    var proviences: [Provience]?
-    
-    required init?(map: Map) {
-        
-    }
-    
-    func mapping(map: Map) {
-        name <- map["Name"]
-        id <- map["Id"]
-        provienceRequired <- map["IsProvienceReq"]
-        code <- map["Code"]
-        proviences <- map["Provinces"]
-    }
-    
+  var name: String?
+  var id: String?
+  var provienceRequired: String?
+  var code: String?
+  var proviences: [Provience]?
+  
+  required init?(map: Map) {
+    
+  }
+  
+  func mapping(map: Map) {
+    name <- map["Name"]
+    id <- map["Id"]
+    provienceRequired <- map["IsProvienceReq"]
+    code <- map["Code"]
+    proviences <- map["Provinces"]
+  }
+  
 }
 
 
 
 class TransferReason: Mappable {
-    var id: String?
-    var title: String?
-    
-    required init?(map: Map) {
-        
-    }
-    
-    func mapping(map: Map) {
-        id <- map["id"]
-        title <- map["text"]
-    }
+  var id: String?
+  var title: String?
+  
+  required init?(map: Map) {
+    
+  }
+  
+  func mapping(map: Map) {
+    id <- map["id"]
+    title <- map["text"]
+  }
 }
 
 class Relation: Mappable {
-    var id: String?
-    var title: String?
-    
-    required init?(map: Map) {
-        
-    }
-    
-    func mapping(map: Map) {
-        id <- map["id"]
-        title <- map["text"]
-    }
+  var id: String?
+  var title: String?
+  
+  required init?(map: Map) {
+    
+  }
+  
+  func mapping(map: Map) {
+    id <- map["id"]
+    title <- map["text"]
+  }
 }
 
 class SendMoneyModel: Mappable {
-    
-    var countries: [CountryModel]?
-    var transferReasons: [TransferReason]?
-    var relations: [Relation]?
-    
-    required init?(map: Map) {
-        
-    }
-    
-    func mapping(map: Map) {
-        countries <- map["Country"]
-        transferReasons <- map["TransferReasons"]
-        relations <- map["Relations"]
-    }
+  
+  var countries: [CountryModel]?
+  var transferReasons: [TransferReason]?
+  var relations: [Relation]?
+  
+//  var idTypes: [[String: String]]?
+  // TODO: check IDTYPES
+  var receiverIDTypes: [ReceiverIdType]?
+  
+  
+  required init?(map: Map) {
+    
+  }
+  
+  func mapping(map: Map) {
+    countries <- map["Country"]
+    transferReasons <- map["TransferReasons"]
+    relations <- map["Relations"]
+    receiverIDTypes <- map["ReceiverIdType"]
+  }
 }
 
 class SendMoneyInformationContainer: Mappable {
-    var errorCode: String?
-    var message: String?
-    var id: String?
-    var data: SendMoneyModel?
-    required init?(map: Map) {
-        
-    }
-    
-    func mapping(map: Map) {
-        errorCode <- map["ErrorCode"]
-        message <- map["Msg"]
-        id <- map["Id"]
-        data <- map["Data"]
-    }
+  var errorCode: String?
+  var message: String?
+  var id: String?
+  var data: SendMoneyModel?
+  required init?(map: Map) {
+    
+  }
+  
+  func mapping(map: Map) {
+    errorCode <- map["ErrorCode"]
+    message <- map["Msg"]
+    id <- map["Id"]
+    data <- map["Data"]
+  }
 }
 
-
-
+class ReceiverIdType: Mappable {
+  var id: String?
+  var text: String?
+  var dependent: String?
+  
+  required init?(map: Map) {}
+  
+  func mapping(map: Map) {
+    id <- map["id"]
+    text <- map["text"]
+    dependent <- map["dependent"]
+  }
+}
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/Presenter/AddReciepientPresenter.swift b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/Presenter/AddReciepientPresenter.swift
index 1d93231c..b28227e8 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/Presenter/AddReciepientPresenter.swift	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/Presenter/AddReciepientPresenter.swift	
@@ -9,128 +9,135 @@
 import Foundation
 
 class AddReciepientPresenter {
+  
+  // MARK: Properties
+  
+  var transferReasons: [TransferReason] = []
+  var relations: [Relation] = []
+  var countries: [CountryModel] = []
+  
+  weak var view: AddReciepientViewInterface?
+  var interactor: AddReciepientInteractorInput?
+  var wireframe: AddReciepientWireframeInput?
+  
+  // MARK: Converting entities
+  
+  func convert(models: [CountryModel]) {
+    let viewmodels: [SendMoneyCountryViewModel] = models.map({
+      let viewmodel = SendMoneyCountryViewModel()
+      viewmodel.name = $0.name
+      viewmodel.code = $0.code
+      viewmodel.id = $0.id
+      viewmodel.proviencesRequired = $0.provienceRequired
+      viewmodel.proviences = self.convert(models: $0.proviences ?? [])
+      return viewmodel
+    })
+    self.view?.show(countries: viewmodels)
+  }
+  
+  func convert(models: [Provience]) -> [SendMoneyProvienceViewModel] {
+    return models.map({
+      var viewmodel = SendMoneyProvienceViewModel()
+      viewmodel.name = $0.name
+      viewmodel.id = $0.id
+      viewmodel.districts = self.convert(models: $0.districts ?? [])
+      return viewmodel
+    })
+  }
+  
+  func convert(models: [District]) -> [SendMoneyDistrictViewModel] {
+    let viewmodels: [SendMoneyDistrictViewModel] =  models.map({
+      let viewmodel = SendMoneyDistrictViewModel()
+      viewmodel.name = $0.name
+      viewmodel.id = $0.id
+      return viewmodel
+    })
+    return viewmodels
+  }
+  
+  func convert(models: [TransferReason]) {
+    let viewmodels: [SendMoneyTransferReasonViewModel] = models.map({
+      var viewmodel = SendMoneyTransferReasonViewModel()
+      viewmodel.title = $0.title
+      viewmodel.id = $0.id
+      return viewmodel
+    })
     
-	// MARK: Properties
-    
-    var transferReasons: [TransferReason] = []
-    var relations: [Relation] = []
-    var countries: [CountryModel] = []
-    
-    weak var view: AddReciepientViewInterface?
-    var interactor: AddReciepientInteractorInput?
-    var wireframe: AddReciepientWireframeInput?
-
-    // MARK: Converting entities
-    
-    func convert(models: [CountryModel]) {
-        let viewmodels: [SendMoneyCountryViewModel] = models.map({
-            let viewmodel = SendMoneyCountryViewModel()
-            viewmodel.name = $0.name
-            viewmodel.code = $0.code
-            viewmodel.id = $0.id
-            viewmodel.proviencesRequired = $0.provienceRequired
-            viewmodel.proviences = self.convert(models: $0.proviences ?? [])
-            return viewmodel
-        })
-        self.view?.show(countries: viewmodels)
-    }
-    
-    func convert(models: [Provience]) -> [SendMoneyProvienceViewModel] {
-        return models.map({
-            var viewmodel = SendMoneyProvienceViewModel()
-            viewmodel.name = $0.name
-            viewmodel.id = $0.id
-            viewmodel.districts = self.convert(models: $0.districts ?? [])
-            return viewmodel
-        })
-    }
-    
-    func convert(models: [District]) -> [SendMoneyDistrictViewModel] {
-        let viewmodels: [SendMoneyDistrictViewModel] =  models.map({
-            let viewmodel = SendMoneyDistrictViewModel()
-            viewmodel.name = $0.name
-            viewmodel.id = $0.id
-            return viewmodel
-        })
-        return viewmodels
-    }
-    
-    func convert(models: [TransferReason]) {
-        let viewmodels: [SendMoneyTransferReasonViewModel] = models.map({
-            var viewmodel = SendMoneyTransferReasonViewModel()
-            viewmodel.title = $0.title
-            viewmodel.id = $0.id
-            return viewmodel
-        })
-        
-        self.view?.show(transferReasons: viewmodels)
-    }
-    
-    func convert(models: [Relation]) {
-        let viewmodels: [SendMoneyRelationViewModel] = models.map({
-            var viemodel = SendMoneyRelationViewModel()
-            viemodel.title = $0.title
-            viemodel.id = $0.id
-            return viemodel
-        })
-        self.view?.show(relations: viewmodels)
-    }
-    
-    func convert(model: ReceipientViewModel) {
-        var reciepient = Recipient()
-        reciepient.firstName = model.firstName
-        reciepient.middleName = model.middleName
-        reciepient.lastName = model.lastName
-        reciepient.countryId = model.countryId
-        reciepient.stateId = model.stateId
-        reciepient.districtId = model.districtId
-        reciepient.city = model.city
-        reciepient.address = model.address
-        reciepient.relationId = model.relationId
-        reciepient.reasonId = model.reasonId
-        reciepient.mobileNumber = model.mobileNumber
-        reciepient.email = model.email
-        self.interactor?.save(reciepient: reciepient)
-    }
+    self.view?.show(transferReasons: viewmodels)
+  }
+  
+  func convert(models: [Relation]) {
+    let viewmodels: [SendMoneyRelationViewModel] = models.map({
+      var viemodel = SendMoneyRelationViewModel()
+      viemodel.title = $0.title
+      viemodel.id = $0.id
+      return viemodel
+    })
+    self.view?.show(relations: viewmodels)
+  }
+  
+  func convert(model: ReceipientViewModel) {
+    var reciepient = Recipient()
+    reciepient.firstName = model.firstName
+    reciepient.middleName = model.middleName
+    reciepient.lastName = model.lastName
+    reciepient.countryId = model.countryId
+    reciepient.stateId = model.stateId
+    reciepient.districtId = model.districtId
+    reciepient.city = model.city
+    reciepient.address = model.address
+    reciepient.relationId = model.relationId
+    reciepient.reasonId = model.reasonId
+    reciepient.mobileNumber = model.mobileNumber
+    reciepient.email = model.email
+    reciepient.idType = model.idType
+    reciepient.idNumber = model.idNumber
     
+    self.interactor?.save(reciepient: reciepient)
+  }
+  
 }
 
- // MARK: AddReciepient module interface
+// MARK: AddReciepient module interface
 
 extension AddReciepientPresenter: AddReciepientModuleInterface {
-    func viewIsReady() {
-        self.view?.showLoading()
-        self.interactor?.viewIsReady()
-    }
-    
-    func save(model: ReceipientViewModel) {
-        self.convert(model: model)
-    }
+  func viewIsReady() {
+    self.view?.showLoading()
+    self.interactor?.viewIsReady()
+  }
+  
+  func save(model: ReceipientViewModel) {
+    self.convert(model: model)
+  }
 }
 
 // MARK: AddReciepient interactor output interface
 
 extension AddReciepientPresenter: AddReciepientInteractorOutput {
-
-    func show(model: SendMoneyModel?) {
-        self.transferReasons = model?.transferReasons ?? []
-        self.relations = model?.relations ?? []
-        self.countries = model?.countries ?? []
-        self.view?.hideLoading()
-        
-        self.convert(models: self.countries)
-        self.convert(models: self.transferReasons)
-        self.convert(models: self.relations)
-        
-    }
+  
+  func show(model: SendMoneyModel?) {
+    self.transferReasons = model?.transferReasons ?? []
+    self.relations = model?.relations ?? []
+    self.countries = model?.countries ?? []
+    
+    //TODO: set IDTYPES
+    self.view?.setReceiverIDTypes(with: model?.receiverIDTypes)
+    
+    self.view?.hideLoading()
     
-    func show(error: Error) {
-        self.view?.hideLoading()
-        self.view?.show(error: error.localizedDescription)
-    }
+    self.convert(models: self.countries)
+    self.convert(models: self.transferReasons)
+    self.convert(models: self.relations)
     
-    func success() {
-        print("successfully added")
-        self.wireframe?.dismiss()
-    }
+  }
+  
+  func show(error: Error) {
+    self.view?.hideLoading()
+    self.view?.show(error: error.localizedDescription)
+  }
+  
+  func success() {
+    print("successfully added")
+    self.wireframe?.dismiss()
+  }
 }
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepient.storyboard b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepient.storyboard
index 3c107bbd..25d63657 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepient.storyboard	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepient.storyboard	
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -23,16 +27,16 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="2cy-hR-Fme">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="1100"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="1066"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="900" translatesAutoresizingMaskIntoConstraints="NO" id="MHV-aS-FoL">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="1071.5"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="1078"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="bJg-iS-Pg8">
-                                                <rect key="frame" x="10" y="0.0" width="355" height="1041.5"/>
+                                                <rect key="frame" x="10" y="0.0" width="355" height="1048"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Lsn-v9-r4g">
-                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="961.5"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="968"/>
                                                         <subviews>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Fgq-xq-dmN" userLabel="TitleStackView">
                                                                 <rect key="frame" x="0.0" y="0.0" width="355" height="63"/>
@@ -50,19 +54,19 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="4GX-ko-nbw" userLabel="ContentStackView">
-                                                                <rect key="frame" x="0.0" y="68" width="355" height="893.5"/>
+                                                                <rect key="frame" x="0.0" y="68" width="355" height="900"/>
                                                                 <subviews>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="e8u-s3-fVl">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="First Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RPh-p3-dap">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's full name" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="ydp-IU-Ddb">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="afy-81-2it"/>
                                                                                 </constraints>
@@ -73,16 +77,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="BQc-tA-RUn">
-                                                                        <rect key="frame" x="0.0" y="69.5" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="70" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Middle Name (Optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lwa-xS-Mou">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's middle name" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Bgi-hL-Wf6">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="tLl-P0-Zbh"/>
                                                                                 </constraints>
@@ -93,16 +97,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="A3K-Ig-mN9">
-                                                                        <rect key="frame" x="0.0" y="139" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="140" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aos-AF-iaO">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's last name" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="xvn-Xq-Poa">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="Ls2-ds-JKU"/>
                                                                                 </constraints>
@@ -113,16 +117,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="kmX-kn-0uS">
-                                                                        <rect key="frame" x="0.0" y="208.5" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="210" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Country" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-aR-bJE">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rTf-lL-eJb">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="69q-4x-Lyu"/>
                                                                                 </constraints>
@@ -133,16 +137,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Uwb-JF-Lu9">
-                                                                        <rect key="frame" x="0.0" y="278" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="280" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="State/Province" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hX8-qF-mLG">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="SpT-9V-3C8">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="Tby-y3-sva"/>
                                                                                 </constraints>
@@ -153,16 +157,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="EtN-9R-GQt">
-                                                                        <rect key="frame" x="0.0" y="347.5" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="350" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="District" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QCa-CZ-ElQ">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6qj-la-Mgu">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="pSC-rQ-oQk"/>
                                                                                 </constraints>
@@ -173,16 +177,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="fh8-Q6-q8A">
-                                                                        <rect key="frame" x="0.0" y="417" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="420" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="City" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="woC-KH-z7x">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's  City" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="cHL-Cf-h5a">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="UAG-D4-uH5"/>
                                                                                 </constraints>
@@ -193,16 +197,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="blF-qq-qJe">
-                                                                        <rect key="frame" x="0.0" y="486.5" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="490" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y1V-LP-rwg">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's Address" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="R9T-Lf-bM4">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="FVQ-W0-QKk"/>
                                                                                 </constraints>
@@ -213,16 +217,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="O4c-KR-vEE">
-                                                                        <rect key="frame" x="0.0" y="556" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="560" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Relation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aVB-K7-liY">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vZS-DH-n7I">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="9YL-SW-YnM"/>
                                                                                 </constraints>
@@ -233,16 +237,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="7Tk-n4-kZ1">
-                                                                        <rect key="frame" x="0.0" y="625.5" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="630" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mobile No." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s2u-oR-Os8">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's mobile number" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="vAR-h8-elx">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="HQh-Pf-Mui"/>
                                                                                 </constraints>
@@ -253,7 +257,7 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="2Kh-Q2-iMo">
-                                                                        <rect key="frame" x="0.0" y="690" width="355" height="43"/>
+                                                                        <rect key="frame" x="0.0" y="695" width="355" height="43"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email (Optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rIa-a1-cYb">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="355" height="0.0"/>
@@ -273,16 +277,16 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="iLj-pG-L6B">
-                                                                        <rect key="frame" x="0.0" y="695" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="700" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transfer Reason" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F7d-NL-98o">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LWI-ug-ZGq">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="Vvx-Qi-ol9"/>
                                                                                 </constraints>
@@ -293,16 +297,17 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="I2d-JJ-OvN" userLabel="IDType">
-                                                                        <rect key="frame" x="0.0" y="764.5" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="770" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID Type (Optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LCW-9T-FLU">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Aqq-Xq-pZT">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
+                                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="gBF-W7-Tev"/>
                                                                                 </constraints>
@@ -313,22 +318,22 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="NH9-gT-qAV" userLabel="IDValue">
-                                                                        <rect key="frame" x="0.0" y="834" width="355" height="59.5"/>
+                                                                        <rect key="frame" x="0.0" y="840" width="355" height="60"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID Number (Optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zyl-vG-rKF">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="16.5"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
-                                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's ID value" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="1YP-BG-HGJ">
-                                                                                <rect key="frame" x="0.0" y="16.5" width="355" height="43"/>
+                                                                            <textField opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's ID value" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="1YP-BG-HGJ">
+                                                                                <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="uF9-AD-1Sx"/>
                                                                                 </constraints>
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
-                                                                                <textInputTraits key="textInputTraits" keyboardType="alphabet"/>
+                                                                                <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
                                                                             </textField>
                                                                         </subviews>
                                                                     </stackView>
@@ -337,7 +342,7 @@
                                                         </subviews>
                                                     </stackView>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BKY-7W-R56">
-                                                        <rect key="frame" x="77.5" y="991.5" width="200" height="50"/>
+                                                        <rect key="frame" x="77.5" y="998" width="200" height="50"/>
                                                         <color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="50" id="H0T-Sg-A4P"/>
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewController.swift b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewController.swift
index 88f49c32..2695ee98 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewController.swift	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewController.swift	
@@ -60,8 +60,24 @@ class AddReciepientViewController: UIViewController {
   private var countries: [SendMoneyCountryViewModel]?
   private var transferReasons: [SendMoneyTransferReasonViewModel]?
   private var relations: [SendMoneyRelationViewModel]?
+  private var receiverIDTypes: [ReceiverIdType]?
+  private var idTypes = [" --- Select ID Type --- "]
+  
   private var reciepient: ReceipientViewModel?
   
+  private var selectedIDType: ReceiverIdType? {
+    didSet {
+      reciepient?.idType = selectedIDType?.id
+      idTypeTextField.text = selectedIDType?.text
+      
+      idNumberTextField.isEnabled = selectedIDType != nil ?  true : false
+      
+      if !idNumberTextField.isEnabled {
+        idNumberTextField.text = nil
+      }
+    }
+  }
+  
   private var selectedCountry: SendMoneyCountryViewModel? {
     didSet {
       self.countryTextField.text = selectedCountry?.name
@@ -135,12 +151,12 @@ class AddReciepientViewController: UIViewController {
   
   @IBAction private func save(_ sender: UIButton) {
     if let reciepient = self.reciepient {
-      guard
-        let code = selectedCountry?.code?.lowercased(),
+      if let code = selectedCountry?.code?.lowercased(),
         let countryCode = CountryEnum(rawValue: code),
-        let mobileNumber = mobileTextField.text else { return }
-      
-      reciepient.mobileNumber = countryCode.phoneCode + mobileNumber
+        let mobileNumber = mobileTextField.text {
+        
+        reciepient.mobileNumber = countryCode.phoneCode + mobileNumber
+      }
       
       self.presenter?.save(model: reciepient)
     }
@@ -165,7 +181,11 @@ class AddReciepientViewController: UIViewController {
     self.addressTextField.autocorrectionType = .no
     
     // for pickerView
-    idTypeTextField.inputView = UIView()
+    let pickerView = UIPickerView()
+    idTypeTextField.inputView = pickerView
+    pickerView.delegate = self
+    pickerView.dataSource = self
+    
   }
 
   private func setup() {
@@ -230,11 +250,10 @@ class AddReciepientViewController: UIViewController {
     self.addressTextField.delegate = self
     self.relationTextField.delegate = self
     self.mobileTextField.delegate = self
-    
   }
   
   private func setupTargets() {
-    [firstNameTextField, middleNameTextField, lastNameTextField, countryTextField, stateProvinceTextField, districtTextField, addressTextField, relationTextField, mobileTextField, emailTextField, transferReasonTextField, cityTextField].forEach({
+    [firstNameTextField, middleNameTextField, lastNameTextField, countryTextField, stateProvinceTextField, districtTextField, addressTextField, relationTextField, mobileTextField, emailTextField, transferReasonTextField, cityTextField, idNumberTextField].forEach({
       $0.addTarget(self, action: #selector(self.textFieldChanged(sender:)), for: UIControl.Event.editingChanged)
     })
   }
@@ -341,9 +360,23 @@ extension AddReciepientViewController: AddReciepientViewInterface {
   func show(relations: [SendMoneyRelationViewModel]) {
     self.relations = relations
   }
+  
+  func setReceiverIDTypes(with model: [ReceiverIdType]?) {
+    receiverIDTypes = model
+    
+    guard let types = receiverIDTypes?.compactMap ({ $0.text }) else {
+      return
+    }
+    
+    idTypes.append(contentsOf: types)
+    
+    print("idTypes count: \(idTypes.count)")
+  }
+  
 }
 
 
+// MARK: - UITextFieldDelegate
 extension AddReciepientViewController: UITextFieldDelegate {
   func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
     switch textField {
@@ -362,19 +395,10 @@ extension AddReciepientViewController: UITextFieldDelegate {
     case transferReasonTextField:
       self.showTransferReasonPickerView()
       return false
-    case idNumberTextField:
-      showIDTypes()
     default:
       return true
     }
   }
-  
-  private func showIDTypes() {
-    let pickerView = UIPickerView()
-    idNumberTextField.inputView = pickerView
-    pickerView.delegate = self
-    pickerView.dataSource = self
-  }
 }
 
 // MARK: - UIPickerViewDataSource
@@ -384,14 +408,18 @@ extension AddReciepientViewController: UIPickerViewDataSource {
   }
   
   func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-    return
+    return idTypes.count
   }
-  
-  
 }
 
 extension AddReciepientViewController: UIPickerViewDelegate {
+  func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+    return idTypes[row]
+  }
   
+  func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+    selectedIDType = row > 0 ? receiverIDTypes?[row - 1] : nil
+  }
 }
 
 
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewInterface.swift b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewInterface.swift
index a04632b4..45f2df7b 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewInterface.swift	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/AddReciepient/User Interface/View/AddReciepientViewInterface.swift	
@@ -7,10 +7,13 @@
 //
 
 protocol AddReciepientViewInterface: class {
-    func show(error: String)
-    func show(countries: [SendMoneyCountryViewModel])
-    func show(transferReasons: [SendMoneyTransferReasonViewModel])
-    func show(relations: [SendMoneyRelationViewModel])
-    func showLoading()
-    func hideLoading()
+  func show(error: String)
+  func show(countries: [SendMoneyCountryViewModel])
+  func show(transferReasons: [SendMoneyTransferReasonViewModel])
+  func show(relations: [SendMoneyRelationViewModel])
+  func showLoading()
+  func hideLoading()
+  
+  func setReceiverIDTypes(with model: [ReceiverIdType]?)
+  
 }
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/Presenter/EditReciepientPresenter.swift b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/Presenter/EditReciepientPresenter.swift
index 9471d459..bce48f41 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/Presenter/EditReciepientPresenter.swift	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/Presenter/EditReciepientPresenter.swift	
@@ -9,161 +9,169 @@
 import Foundation
 
 class EditReciepientPresenter {
+  
+  // MARK: Properties
+  
+  var transferReasons: [TransferReason] = []
+  var relations: [Relation] = []
+  var countries: [CountryModel] = []
+  
+  
+  weak var view: EditReciepientViewInterface?
+  var interactor: EditReciepientInteractorInput?
+  var wireframe: EditReciepientWireframeInput?
+  
+  // MARK: Converting entities
+  
+  func convert(models: [CountryModel]) {
+    let viewmodels: [SendMoneyCountryViewModel] = models.map({
+      let viewmodel = SendMoneyCountryViewModel()
+      viewmodel.name = $0.name
+      viewmodel.code = $0.code
+      viewmodel.id = $0.id
+      viewmodel.proviencesRequired = $0.provienceRequired
+      viewmodel.proviences = self.convert(models: $0.proviences ?? [])
+      return viewmodel
+    })
+    self.view?.show(countries: viewmodels)
+  }
+  
+  func convert(models: [Provience]) -> [SendMoneyProvienceViewModel] {
+    return models.map({
+      var viewmodel = SendMoneyProvienceViewModel()
+      viewmodel.name = $0.name
+      viewmodel.id = $0.id
+      viewmodel.districts = self.convert(models: $0.districts ?? [])
+      return viewmodel
+    })
+  }
+  
+  func convert(models: [District]) -> [SendMoneyDistrictViewModel] {
+    let viewmodels: [SendMoneyDistrictViewModel] =  models.map({
+      let viewmodel = SendMoneyDistrictViewModel()
+      viewmodel.name = $0.name
+      viewmodel.id = $0.id
+      return viewmodel
+    })
+    return viewmodels
+  }
+  
+  func convert(models: [TransferReason]) {
+    let viewmodels: [SendMoneyTransferReasonViewModel] = models.map({
+      var viewmodel = SendMoneyTransferReasonViewModel()
+      viewmodel.title = $0.title
+      viewmodel.id = $0.id
+      return viewmodel
+    })
     
-    // MARK: Properties
+    self.view?.show(transferReasons: viewmodels)
+  }
+  
+  func convert(models: [Relation]) {
+    let viewmodels: [SendMoneyRelationViewModel] = models.map({
+      var viemodel = SendMoneyRelationViewModel()
+      viemodel.title = $0.title
+      viemodel.id = $0.id
+      return viemodel
+    })
+    self.view?.show(relations: viewmodels)
+  }
+  
+  func convert(model: EditRecipientRecipientViewModel) {
+    var reciepient = Recipient()
+    reciepient.recipientId = model.id
+    reciepient.firstName = model.firstName
+    reciepient.middleName = model.middleName
+    reciepient.lastName = model.lastName
+    reciepient.countryId = model.countryId
+    reciepient.country = model.country
+    reciepient.stateId = model.stateId
+    reciepient.state = model.state
+    reciepient.district = model.district
+    reciepient.districtId = model.districtId
+    reciepient.city = model.city
+    reciepient.address = model.address
+    reciepient.relation = model.relation
+    reciepient.relationId = model.relationId
+    reciepient.reason = model.reason
+    reciepient.reasonId = model.reasonId
+    reciepient.mobileNumber = model.mobileNumber
+    reciepient.email = model.email
+    reciepient.idType = model.idType
+    reciepient.idNumber = model.idNumber
+    self.interactor?.save(reciepient: reciepient)
+  }
+  
+  func convert(model: Recipient) {
+    let reciepient = EditRecipientRecipientViewModel()
+    reciepient.id = model.recipientId
+    reciepient.firstName = model.firstName
+    reciepient.middleName = model.middleName
+    reciepient.lastName = model.lastName
+    reciepient.country = model.country
+    reciepient.countryId = model.countryId
+    reciepient.state = model.state
+    reciepient.stateId = model.stateId
+    reciepient.city = model.city
+    reciepient.address = model.address
+    reciepient.relation = model.relation
+    reciepient.relationId = model.relationId
+    reciepient.reason = model.reason
+    reciepient.reasonId = model.reasonId
+    reciepient.mobileNumber = model.mobileNumber
+    reciepient.email = model.email
+    reciepient.district = model.district
+    reciepient.districtId = model.districtId
+    reciepient.idType = model.idType
+    reciepient.idNumber = model.idNumber
     
-    var transferReasons: [TransferReason] = []
-    var relations: [Relation] = []
-    var countries: [CountryModel] = []
-
-    
-    weak var view: EditReciepientViewInterface?
-    var interactor: EditReciepientInteractorInput?
-    var wireframe: EditReciepientWireframeInput?
-
-    // MARK: Converting entities
-    
-    func convert(models: [CountryModel]) {
-        let viewmodels: [SendMoneyCountryViewModel] = models.map({
-            let viewmodel = SendMoneyCountryViewModel()
-            viewmodel.name = $0.name
-            viewmodel.code = $0.code
-            viewmodel.id = $0.id
-            viewmodel.proviencesRequired = $0.provienceRequired
-            viewmodel.proviences = self.convert(models: $0.proviences ?? [])
-            return viewmodel
-        })
-        self.view?.show(countries: viewmodels)
-    }
-    
-    func convert(models: [Provience]) -> [SendMoneyProvienceViewModel] {
-        return models.map({
-            var viewmodel = SendMoneyProvienceViewModel()
-            viewmodel.name = $0.name
-            viewmodel.id = $0.id
-            viewmodel.districts = self.convert(models: $0.districts ?? [])
-            return viewmodel
-        })
-    }
-    
-    func convert(models: [District]) -> [SendMoneyDistrictViewModel] {
-        let viewmodels: [SendMoneyDistrictViewModel] =  models.map({
-            let viewmodel = SendMoneyDistrictViewModel()
-            viewmodel.name = $0.name
-            viewmodel.id = $0.id
-            return viewmodel
-        })
-        return viewmodels
-    }
-    
-    func convert(models: [TransferReason]) {
-        let viewmodels: [SendMoneyTransferReasonViewModel] = models.map({
-            var viewmodel = SendMoneyTransferReasonViewModel()
-            viewmodel.title = $0.title
-            viewmodel.id = $0.id
-            return viewmodel
-        })
-        
-        self.view?.show(transferReasons: viewmodels)
-    }
-    
-    func convert(models: [Relation]) {
-        let viewmodels: [SendMoneyRelationViewModel] = models.map({
-            var viemodel = SendMoneyRelationViewModel()
-            viemodel.title = $0.title
-            viemodel.id = $0.id
-            return viemodel
-        })
-        self.view?.show(relations: viewmodels)
-    }
-    
-    func convert(model: EditRecipientRecipientViewModel) {
-        var reciepient = Recipient()
-        reciepient.recipientId = model.id
-        reciepient.firstName = model.firstName
-        reciepient.middleName = model.middleName
-        reciepient.lastName = model.lastName
-        reciepient.countryId = model.countryId
-        reciepient.country = model.country
-        reciepient.stateId = model.stateId
-        reciepient.state = model.state
-        reciepient.district = model.district
-        reciepient.districtId = model.districtId
-        reciepient.city = model.city
-        reciepient.address = model.address
-        reciepient.relation = model.relation
-        reciepient.relationId = model.relationId
-        reciepient.reason = model.reason
-        reciepient.reasonId = model.reasonId
-        reciepient.mobileNumber = model.mobileNumber
-        reciepient.email = model.email
-        self.interactor?.save(reciepient: reciepient)
-    }
-    
-    func convert(model: Recipient) {
-        let reciepient = EditRecipientRecipientViewModel()
-        reciepient.id = model.recipientId
-        reciepient.firstName = model.firstName
-        reciepient.middleName = model.middleName
-        reciepient.lastName = model.lastName
-        reciepient.country = model.country
-        reciepient.countryId = model.countryId
-        reciepient.state = model.state
-        reciepient.stateId = model.stateId
-        reciepient.city = model.city
-        reciepient.address = model.address
-        reciepient.relation = model.relation
-        reciepient.relationId = model.relationId
-        reciepient.reason = model.reason
-        reciepient.reasonId = model.reasonId
-        reciepient.mobileNumber = model.mobileNumber
-        reciepient.email = model.email
-        reciepient.district = model.district
-        reciepient.districtId = model.districtId
-        
-        self.view?.show(recipient: reciepient)
-    }
+    self.view?.show(recipient: reciepient)
+  }
 }
 
- // MARK: EditReciepient module interface
+// MARK: EditReciepient module interface
 
 extension EditReciepientPresenter: EditReciepientModuleInterface {
-    func viewIsReady() {
-        self.view?.showLoading()
-        self.interactor?.viewIsReady()
-    }
-    
-    func save(model: EditRecipientRecipientViewModel) {
-        self.convert(model: model)
-    }
+  func viewIsReady() {
+    self.view?.showLoading()
+    self.interactor?.viewIsReady()
+  }
+  
+  func save(model: EditRecipientRecipientViewModel) {
+    self.convert(model: model)
+  }
 }
 
 // MARK: EditReciepient interactor output interface
 
 extension EditReciepientPresenter: EditReciepientInteractorOutput {
-    func show(model: SendMoneyModel?) {
-        self.transferReasons = model?.transferReasons ?? []
-        self.relations = model?.relations ?? []
-        self.countries = model?.countries ?? []
-        self.view?.hideLoading()
-        
-        self.convert(models: self.countries)
-        self.convert(models: self.transferReasons)
-        self.convert(models: self.relations)
-        
-    }
+  func show(model: SendMoneyModel?) {
+    self.transferReasons = model?.transferReasons ?? []
+    self.relations = model?.relations ?? []
+    self.countries = model?.countries ?? []
+    
+    //TODO: set IDTYPES
+    self.view?.setReceiverIDTypes(with: model?.receiverIDTypes)
     
-    func show(error: Error) {
-        self.view?.hideLoading()
-        self.view?.show(error: error.localizedDescription)
-    }
+    self.view?.hideLoading()
     
-    func success() {
-        print("successfully added")
-        self.wireframe?.dismiss()
-    }
+    self.convert(models: self.countries)
+    self.convert(models: self.transferReasons)
+    self.convert(models: self.relations)
     
-    func show(recipient: Recipient) {
-        self.convert(model: recipient)
-    }
+  }
+  
+  func show(error: Error) {
+    self.view?.hideLoading()
+    self.view?.show(error: error.localizedDescription)
+  }
+  
+  func success() {
+    print("successfully added")
+    self.wireframe?.dismiss()
+  }
+  
+  func show(recipient: Recipient) {
+    self.convert(model: recipient)
+  }
 }
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/Presenter/EditRecipientRecipientViewModel.swift b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/Presenter/EditRecipientRecipientViewModel.swift
index 75927d3c..ecd8364d 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/Presenter/EditRecipientRecipientViewModel.swift	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/Presenter/EditRecipientRecipientViewModel.swift	
@@ -9,23 +9,25 @@
 import Foundation
 
 class EditRecipientRecipientViewModel {
-    var id: String?
-    var firstName: String?
-    var middleName: String?
-    var lastName: String?
-    var country: String?
-    var state: String?
-    var stateId: String?
-    var city: String?
-    var address: String?
-    var district: String?
-    var districtId: String?
-    var relation: String?
-    var relationId: String?
-    var mobileNumber: String?
-    var email: String?
-    var recipientId: String?
-    var reason: String?
-    var reasonId: String?
-    var countryId: String?
+  var id: String?
+  var firstName: String?
+  var middleName: String?
+  var lastName: String?
+  var country: String?
+  var state: String?
+  var stateId: String?
+  var city: String?
+  var address: String?
+  var district: String?
+  var districtId: String?
+  var relation: String?
+  var relationId: String?
+  var mobileNumber: String?
+  var email: String?
+  var recipientId: String?
+  var reason: String?
+  var reasonId: String?
+  var countryId: String?
+  var idType: String?
+  var idNumber: String?
 }
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepient.storyboard b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepient.storyboard
index 3b3b1a05..e3b0cd74 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepient.storyboard	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepient.storyboard	
@@ -265,7 +265,7 @@
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
-                                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's email address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="9ed-NF-4Bh">
+                                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's email address" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="9ed-NF-4Bh">
                                                                                 <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="gjZ-nr-ohs"/>
@@ -325,7 +325,7 @@
                                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
-                                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's ID value" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ltw-9N-ptX">
+                                                                            <textField opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's ID number" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Ltw-9N-ptX">
                                                                                 <rect key="frame" x="0.0" y="17" width="355" height="43"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="43" id="dby-rF-LPT"/>
@@ -411,10 +411,10 @@
                         <outlet property="firstNameTextField" destination="9Hx-oK-GHi" id="p0R-9y-ddA"/>
                         <outlet property="firstNameTitleLabel" destination="uA5-jW-mEK" id="LW5-dY-6u1"/>
                         <outlet property="headerTItleLabel" destination="Gt4-fi-XBm" id="ZxT-SD-W8B"/>
+                        <outlet property="idNumberTextField" destination="Ltw-9N-ptX" id="wsj-ox-uHZ"/>
+                        <outlet property="idNumberTitleLabel" destination="87k-Ld-cG5" id="POX-We-zdJ"/>
                         <outlet property="idTypeTextField" destination="1WU-BO-ZpU" id="8gL-nW-9Ny"/>
                         <outlet property="idTypeTitleLabel" destination="0Ex-bx-3lb" id="yqu-dL-fTh"/>
-                        <outlet property="idValueTextField" destination="Ltw-9N-ptX" id="wsj-ox-uHZ"/>
-                        <outlet property="idValueTitleLabel" destination="87k-Ld-cG5" id="POX-We-zdJ"/>
                         <outlet property="lastNameTextField" destination="Wd8-zG-klN" id="SwR-Rv-7au"/>
                         <outlet property="lastNametitleLabel" destination="tkw-bR-Oy9" id="O5M-hY-gva"/>
                         <outlet property="middleNameTextField" destination="Eej-kG-wrd" id="qZZ-WV-0Fb"/>
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewController.swift b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewController.swift
index 75c7858e..60baed16 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewController.swift	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewController.swift	
@@ -76,8 +76,8 @@ class EditReciepientViewController: UIViewController {
   @IBOutlet weak var idTypeTitleLabel: UILabel!
   @IBOutlet weak var idTypeTextField: UITextField!
   
-  @IBOutlet weak var idValueTitleLabel: UILabel!
-  @IBOutlet weak var idValueTextField: UITextField!
+  @IBOutlet weak var idNumberTitleLabel: UILabel!
+  @IBOutlet weak var idNumberTextField: UITextField!
   
   
   // MARK: Properties
@@ -86,6 +86,25 @@ class EditReciepientViewController: UIViewController {
   var countries: [SendMoneyCountryViewModel]?
   var transferReasons: [SendMoneyTransferReasonViewModel]?
   var relations: [SendMoneyRelationViewModel]?
+  
+  private var receiverIDTypes: [ReceiverIdType]?
+  
+  private var idTypes = [" --- Select ID Type --- "]
+  
+  private var selectedIDType: ReceiverIdType? {
+    didSet {
+      reciepient?.idType = selectedIDType?.id
+      idTypeTextField.text = selectedIDType?.text
+      
+      idNumberTextField.isEnabled = selectedIDType != nil ?  true : false
+      
+      if !idNumberTextField.isEnabled {
+        idNumberTextField.text = nil
+      }
+      
+    }
+  }
+  
   var reciepient: EditRecipientRecipientViewModel? {
     didSet {
       self.populateInformations()
@@ -171,6 +190,13 @@ class EditReciepientViewController: UIViewController {
     self.setupNavigation()
     self.configureView(isHidden: true)
     self.configureLanguage()
+    
+    // for pickerView
+    let pickerView = UIPickerView()
+    idTypeTextField.inputView = pickerView
+    pickerView.delegate = self
+    pickerView.dataSource = self
+    
   }
   
   private func configureLanguage() {
@@ -217,7 +243,7 @@ class EditReciepientViewController: UIViewController {
   }
   
   private func setupTargets() {
-    [firstNameTextField, middleNameTextField, lastNameTextField, countryTextField, stateProvinceTextField, districtTextField, addressTextField, relationTextField, mobileTextField, emailTextField, transferReasonTextField, cityTextField].forEach({
+    [firstNameTextField, middleNameTextField, lastNameTextField, countryTextField, stateProvinceTextField, districtTextField, addressTextField, relationTextField, mobileTextField, emailTextField, transferReasonTextField, cityTextField, idNumberTextField].forEach({
       $0?.addTarget(self, action: #selector(self.textFieldChanged(sender:)), for: UIControl.Event.editingChanged)
     })
   }
@@ -240,6 +266,8 @@ class EditReciepientViewController: UIViewController {
       self.reciepient?.mobileNumber = mobileTextField.text!
     case emailTextField:
       self.reciepient?.email = emailTextField.text!
+    case idNumberTextField:
+      reciepient?.idNumber = idNumberTextField.text
     default:
       break
     }
@@ -267,6 +295,13 @@ class EditReciepientViewController: UIViewController {
     self.addressTextField.text = reciepient?.address
     
     
+    self.selectedIDType = receiverIDTypes?
+      .filter{ $0.id == self.reciepient?.idType}
+      .first
+    
+    self.idNumberTextField.text = reciepient?.idNumber
+    
+    
     // For sync country in reciepient model
     self.selectedCountry = self.countries?.filter{
       $0.name  == self.reciepient?.country
@@ -288,6 +323,8 @@ class EditReciepientViewController: UIViewController {
     
     self.mobileTextField.text = self.reciepient?.mobileNumber?.replacingOccurrences(of: countryCode.phoneCode, with: "")
     
+    
+    
   }
   
   private func setupNavigation() {
@@ -375,6 +412,17 @@ extension EditReciepientViewController: EditReciepientViewInterface {
   func show(recipient: EditRecipientRecipientViewModel) {
     self.reciepient = recipient
   }
+  
+  func setReceiverIDTypes(with model: [ReceiverIdType]?) {
+    receiverIDTypes = model
+    
+    guard let types = receiverIDTypes?.compactMap ({ $0.text }) else {
+      return
+    }
+    
+    idTypes.append(contentsOf: types)
+    
+  }
 }
 
 extension EditReciepientViewController: UITextFieldDelegate {
@@ -454,3 +502,24 @@ extension EditReciepientViewController: TablePresenterDelegate {
   }
   
 }
+
+// MARK: - UIPickerViewDataSource
+extension EditReciepientViewController: UIPickerViewDataSource {
+  func numberOfComponents(in pickerView: UIPickerView) -> Int {
+    return 1
+  }
+  
+  func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+    return idTypes.count
+  }
+}
+
+extension EditReciepientViewController: UIPickerViewDelegate {
+  func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+    return idTypes[row]
+  }
+  
+  func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+    selectedIDType = row > 0 ? receiverIDTypes?[row - 1] : nil
+  }
+}
diff --git a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewInterface.swift b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewInterface.swift
index 91d3c450..ec39e3c8 100644
--- a/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewInterface.swift	
+++ b/GMERemittance/Module/SendMoneyModules/Recipient/EditReciepient/User Interface/View/EditReciepientViewInterface.swift	
@@ -7,11 +7,13 @@
 //
 
 protocol EditReciepientViewInterface: class {
-    func show(error: String)
-    func show(countries: [SendMoneyCountryViewModel])
-    func show(transferReasons: [SendMoneyTransferReasonViewModel])
-    func show(relations: [SendMoneyRelationViewModel])
-    func show(recipient: EditRecipientRecipientViewModel)
-    func showLoading()
-    func hideLoading()
+  func show(error: String)
+  func show(countries: [SendMoneyCountryViewModel])
+  func show(transferReasons: [SendMoneyTransferReasonViewModel])
+  func show(relations: [SendMoneyRelationViewModel])
+  func show(recipient: EditRecipientRecipientViewModel)
+  func showLoading()
+  func hideLoading()
+  
+  func setReceiverIDTypes(with model: [ReceiverIdType]?)
 }