From 1985ea209be1a42dbc0a36cae54b0f0b3660e008 Mon Sep 17 00:00:00 2001 From: ccr Date: Wed, 22 Aug 2018 06:29:42 +0900 Subject: [PATCH 1/3] removed unnecessary code --- GMERemittance.xcodeproj/project.pbxproj | 12 +++++ .../UserInterfaceState.xcuserstate | Bin 29516 -> 33469 bytes .../TablePickerViewController.swift | 46 +++--------------- GMERemittance/Model/ExchangeRateModel.swift | 25 ++++++++++ .../Module/ExchangeRateViewControllerV2.swift | 1 - 5 files changed, 44 insertions(+), 40 deletions(-) create mode 100644 GMERemittance/Model/ExchangeRateModel.swift diff --git a/GMERemittance.xcodeproj/project.pbxproj b/GMERemittance.xcodeproj/project.pbxproj index e77ee6aa..ced6dda7 100644 --- a/GMERemittance.xcodeproj/project.pbxproj +++ b/GMERemittance.xcodeproj/project.pbxproj @@ -231,6 +231,7 @@ D962231B212BE4CA00B7A115 /* TablePickerWithImageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D962231A212BE4CA00B7A115 /* TablePickerWithImageTableViewCell.swift */; }; EBFC1719B80F43F88EB01F69 /* Pods_GMERemittanceTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0380AEB198AADC0BC4394515 /* Pods_GMERemittanceTests.framework */; }; FF29296C212B8DFE00FF5BAC /* ExchangeRateCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF29296B212B8DFE00FF5BAC /* ExchangeRateCollectionViewCell.swift */; }; + FFCD7605212CB99500CF1EF2 /* ExchangeRateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFCD7604212CB99500CF1EF2 /* ExchangeRateModel.swift */; }; FFD19C7C2112E8F20073689F /* Pods_GMERemittance.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FFD19C7B2112E8F20073689F /* Pods_GMERemittance.framework */; }; /* End PBXBuildFile section */ @@ -491,6 +492,7 @@ D962231A212BE4CA00B7A115 /* TablePickerWithImageTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TablePickerWithImageTableViewCell.swift; sourceTree = ""; }; E4028C5A57499BB54764190C /* Pods_GMERemittanceUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMERemittanceUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FF29296B212B8DFE00FF5BAC /* ExchangeRateCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExchangeRateCollectionViewCell.swift; sourceTree = ""; }; + FFCD7604212CB99500CF1EF2 /* ExchangeRateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExchangeRateModel.swift; sourceTree = ""; }; FFD19C7B2112E8F20073689F /* Pods_GMERemittance.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Pods_GMERemittance.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -881,6 +883,7 @@ 9FD260F61FD00458007A511D /* GMERemittance */ = { isa = PBXGroup; children = ( + FFCD7603212CB97C00CF1EF2 /* Model */, D96222FF212BD5E700B7A115 /* Library */, D907AB96212AA8A300915A87 /* Module */, 8430C7512109E1FF00279191 /* Base */, @@ -1056,6 +1059,14 @@ path = Cell; sourceTree = ""; }; + FFCD7603212CB97C00CF1EF2 /* Model */ = { + isa = PBXGroup; + children = ( + FFCD7604212CB99500CF1EF2 /* ExchangeRateModel.swift */, + ); + path = Model; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -1517,6 +1528,7 @@ 04B232DF2003732E00736B89 /* RequestNewCodeViewController.swift in Sources */, A24B44FA204CF108009BF491 /* InviteeModel.swift in Sources */, 9FB54C1320088EF7003454E2 /* WithdrawViewController.swift in Sources */, + FFCD7605212CB99500CF1EF2 /* ExchangeRateModel.swift in Sources */, 0496B84E1FE7DFCD0044810E /* UIViewControllerExtension.swift in Sources */, A2B6CF19201469C800151863 /* EditCommentViewController.swift in Sources */, A25CF60920467BA40029BC12 /* InviteViewController.swift in Sources */, diff --git a/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate b/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate index 0ca04ad28741401fe25d75fd1da6436e9f5df54d..f1ffdb0e428258229ecb5249d27d0d09c54c6287 100644 GIT binary patch delta 15396 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 diff --git a/GMERemittance/Library/TablePicker/TablePickerViewController.swift b/GMERemittance/Library/TablePicker/TablePickerViewController.swift index bd498d78..55fd5b64 100644 --- a/GMERemittance/Library/TablePicker/TablePickerViewController.swift +++ b/GMERemittance/Library/TablePicker/TablePickerViewController.swift @@ -45,7 +45,7 @@ class TablePickerViewController: UIViewController { var allowSelection = true var doneAction: (([String]) -> ())? var defaultSelectedData: [String] = [] - var showFlag = false + var searchText = "" var type: TablePickerViewTitle? @@ -104,13 +104,7 @@ class TablePickerViewController: UIViewController { } private func addGradientView() { -// let gradientview = GradientView() -// gradientview.leftColor = Constants.gradientviewLeftColor -// gradientview.rightColor = Constants.gradientviewRightColor -// if let navbarFrame = self.navigationController?.navigationBar.frame { -// gradientview.frame = navbarFrame -// } -// self.navigationController?.navigationBar.addSubview(gradientview) + } @objc private func search(sender: UITextField) { @@ -158,30 +152,14 @@ class TablePickerViewController: UIViewController { } extension TablePickerViewController: UITableViewDelegate { - - func getImageCell(tableView: UITableView, indexPath: IndexPath) -> UITableViewCell { + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { let cell = tableView.cellForRow(at: indexPath) as! TablePickerTableViewCell cell.selectedPlace = self.filteredPlaces.elementAt(index: indexPath.row) cell.setup() if !self.allowMultipleSelection { self.close(nil) } - return cell - } - - func getTextCell(tableView: UITableView, indexPath: IndexPath) -> UITableViewCell { - let cell = tableView.cellForRow(at: indexPath) as! TablePickerTableViewCell - cell.selectedPlace = self.filteredPlaces.elementAt(index: indexPath.row) - cell.setup() - if !self.allowMultipleSelection { - self.close(nil) - } - return cell - } - - func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - self.showFlag ? getImageCell(tableView: tableView, indexPath: indexPath) : - getTextCell(tableView: tableView, indexPath: indexPath) } func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { @@ -189,9 +167,8 @@ extension TablePickerViewController: UITableViewDelegate { cell.selectedPlace = nil cell.setup() } else { - print("wtf happened here??") + print("something happened here??") } -// cell?.accessoryType = .none } func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) { @@ -218,10 +195,10 @@ extension TablePickerViewController: UITableViewDataSource { } func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - return self.showFlag ? self.configureImageCel(tableView: tableView, indexPath: indexPath) : configureTextCell(tableView: tableView,indexPath: indexPath) + return self.configureImageCell(tableView: tableView, indexPath: indexPath) } - func configureImageCel(tableView: UITableView, indexPath: IndexPath) -> UITableViewCell { + func configureImageCell(tableView: UITableView, indexPath: IndexPath) -> UITableViewCell { let cell = tableVIew.dequeueReusableCell(withIdentifier: "TablePickerWithImageTableViewCell", for: indexPath) as! TablePickerWithImageTableViewCell cell.title = filteredPlaces.elementAt(index: indexPath.row) let onlyIndex = filteredPlaces[indexPath.row].components(separatedBy: " ").first ?? "" @@ -230,13 +207,4 @@ extension TablePickerViewController: UITableViewDataSource { cell.setup() return cell } - - func configureTextCell(tableView: UITableView, indexPath: IndexPath) -> UITableViewCell { - let cell = tableVIew.dequeueReusableCell(withIdentifier: "TablePickerTableViewCell", for: indexPath) as! TablePickerTableViewCell - cell.title = filteredPlaces.elementAt(index: indexPath.row) - let onlyIndex = filteredPlaces[indexPath.row].components(separatedBy: " ").first ?? "" - cell.selectedPlace = self.defaultSelectedData.first - cell.setup() - return cell - } } diff --git a/GMERemittance/Model/ExchangeRateModel.swift b/GMERemittance/Model/ExchangeRateModel.swift new file mode 100644 index 00000000..74208f89 --- /dev/null +++ b/GMERemittance/Model/ExchangeRateModel.swift @@ -0,0 +1,25 @@ +// +// ExchangeRateModel.swift +// GMERemittance +// +// Created by shishir sapkota on 8/22/18. +// Copyright © 2018 Gobal Money Express Co. Ltd. All rights reserved. +// + +import Foundation +import ObjectMapper + + +class ExchangeRateModel { + var country: String? + var countryCode: String? + var currency: String? + var availableServices: [PaymentServiceType]? + +} + +class PaymentServiceType { + var id: String? + var type: String? + var subtitle: String? +} diff --git a/GMERemittance/Module/ExchangeRateViewControllerV2.swift b/GMERemittance/Module/ExchangeRateViewControllerV2.swift index a3bcef4b..b81c7c5b 100644 --- a/GMERemittance/Module/ExchangeRateViewControllerV2.swift +++ b/GMERemittance/Module/ExchangeRateViewControllerV2.swift @@ -52,7 +52,6 @@ class ExchangeRateViewControllerV2: UIViewController { print("show Country List") let viewcontroller = UIStoryboard.init(name: "TableViewPicker", bundle: nil).instantiateViewController(withIdentifier: "TablePickerViewController") as! TablePickerViewController viewcontroller.data = ["Nepal", "Japan", "Korea", "Nepal", "Japan", "Korea", "Nepal", "Japan", "Korea", "Nepal", "Japan", "Korea"] - viewcontroller.showFlag = true viewcontroller.type = TablePickerViewTitle.country self.present(viewcontroller, animated: true, completion: nil) } From a713e91a06530d41a352fc1b5f4626fbf042edc4 Mon Sep 17 00:00:00 2001 From: ccr Date: Wed, 22 Aug 2018 07:01:45 +0900 Subject: [PATCH 2/3] selected country --- .../UserInterfaceState.xcuserstate | Bin 33469 -> 35232 bytes .../TablePickerTableViewCell.swift | 15 +++--- .../TablePickerViewController.swift | 39 +++++++-------- .../TablePickerWithImageTableViewCell.swift | 6 +-- .../Module/ExchangeRateViewControllerV2.swift | 46 ++++++++++++++++-- 5 files changed, 72 insertions(+), 34 deletions(-) diff --git a/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate b/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate index f1ffdb0e428258229ecb5249d27d0d09c54c6287..a908a41a41f959c99e5c6a5a21bec81168f5b9c4 100644 GIT binary patch delta 14181 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 delta 13065 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 ())? - var defaultSelectedData: [String] = [] + var doneAction: (([ExchangeRateModel]) -> ())? + var defaultSelectedData: [ExchangeRateModel] = [] var searchText = "" var type: TablePickerViewTitle? @@ -116,21 +116,17 @@ class TablePickerViewController: UIViewController { } self.filteredPlaces = self.data.filter({ return searchString.isEmpty || - $0.lowercased().contains(searchString.lowercased()) + ($0.country ?? "").lowercased().contains(searchString.lowercased()) }).sorted(by: { (a, _) -> Bool in - return a.lowercased().hasPrefix(searchString.lowercased()) + return (a.country?.lowercased() ?? "").hasPrefix(searchString.lowercased()) }) } -// private func getNotificationName() -> Notification.Name { -//// return Notification.Name.init(NotificationNames.from) -// } - // MARK: IBActions @IBAction func close(_ sender: Any?) { let selectedIndexPaths = self.tableVIew.indexPathsForSelectedRows ?? self.tableVIew.indexPathForSelectedRow.map({[$0]}) - let selectedData = selectedIndexPaths?.flatMap { indexPath -> String? in + let selectedData = selectedIndexPaths?.compactMap { indexPath -> ExchangeRateModel? in let value = filteredPlaces.elementAt(index: indexPath.row) return value } @@ -172,10 +168,13 @@ extension TablePickerViewController: UITableViewDelegate { } func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) { - let onlyIndex = (filteredPlaces.elementAt(index: indexPath.row) ?? "").components(separatedBy: " ").first ?? "" - if defaultSelectedData.contains(onlyIndex) { - tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none) + let onlyIndex = (filteredPlaces.elementAt(index: indexPath.row)?.countryCode ?? "") + if onlyIndex == defaultSelectedData.first?.country ?? "" { + tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none) } +// if defaultSelectedData.contains(onlyIndex) { +// tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none) +// } } func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { @@ -199,12 +198,14 @@ extension TablePickerViewController: UITableViewDataSource { } func configureImageCell(tableView: UITableView, indexPath: IndexPath) -> UITableViewCell { - let cell = tableVIew.dequeueReusableCell(withIdentifier: "TablePickerWithImageTableViewCell", for: indexPath) as! TablePickerWithImageTableViewCell - cell.title = filteredPlaces.elementAt(index: indexPath.row) - let onlyIndex = filteredPlaces[indexPath.row].components(separatedBy: " ").first ?? "" + let cell = tableVIew.dequeueReusableCell(withIdentifier: "TablePickerTableViewCell", for: indexPath) as! TablePickerTableViewCell cell.selectedPlace = self.defaultSelectedData.first - cell.selectedPlaceShortCode = "korea" + cell.place = self.filteredPlaces.elementAt(index: indexPath.row) cell.setup() return cell + +// cell.title = filteredPlaces.elementAt(index: indexPath.row)?.country +// let onlyIndex = filteredPlaces[indexPath.row] +// cell.selectedPlaceShortCode = "korea" } } diff --git a/GMERemittance/Library/TablePicker/TablePickerWithImageTableViewCell.swift b/GMERemittance/Library/TablePicker/TablePickerWithImageTableViewCell.swift index 062cbfa0..24c0e4f6 100644 --- a/GMERemittance/Library/TablePicker/TablePickerWithImageTableViewCell.swift +++ b/GMERemittance/Library/TablePicker/TablePickerWithImageTableViewCell.swift @@ -15,8 +15,8 @@ class TablePickerWithImageTableViewCell: UITableViewCell { @IBOutlet weak var checkImageView: UIImageView! var title: String? - var selectedPlace: String? - var selectedPlaceShortCode: String? + var selectedPlace: ExchangeRateModel? + override func awakeFromNib() { super.awakeFromNib() @@ -26,7 +26,7 @@ class TablePickerWithImageTableViewCell: UITableViewCell { func setup() { self.titleLabel.text = title - if let image = UIImage.init(named: self.selectedPlaceShortCode ?? "") { + if let image = UIImage.init(named: self.selectedPlace?.countryCode ?? "") { self.imageview.image = image } } diff --git a/GMERemittance/Module/ExchangeRateViewControllerV2.swift b/GMERemittance/Module/ExchangeRateViewControllerV2.swift index b81c7c5b..8e1d6570 100644 --- a/GMERemittance/Module/ExchangeRateViewControllerV2.swift +++ b/GMERemittance/Module/ExchangeRateViewControllerV2.swift @@ -30,6 +30,9 @@ class ExchangeRateViewControllerV2: UIViewController { var selectedPaymentIndex: IndexPath = IndexPath.init(row: 0, section: 0) + + var exchangeRateModels: [ExchangeRateModel] = [] + // Life Cycle override func viewDidLoad() { super.viewDidLoad() @@ -37,9 +40,11 @@ class ExchangeRateViewControllerV2: UIViewController { setupDelegates() setupTargets() setupNavigation() + createTestModel() // Do any additional setup after loading the view. } + override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) self.title = "Today's Rate" @@ -51,15 +56,16 @@ class ExchangeRateViewControllerV2: UIViewController { @objc func showCountryList(_ sender: UITapGestureRecognizer) { print("show Country List") let viewcontroller = UIStoryboard.init(name: "TableViewPicker", bundle: nil).instantiateViewController(withIdentifier: "TablePickerViewController") as! TablePickerViewController - viewcontroller.data = ["Nepal", "Japan", "Korea", "Nepal", "Japan", "Korea", "Nepal", "Japan", "Korea", "Nepal", "Japan", "Korea"] + viewcontroller.data = self.exchangeRateModels viewcontroller.type = TablePickerViewTitle.country + viewcontroller.doneAction = self.countrySelected self.present(viewcontroller, animated: true, completion: nil) } - // private function - private func showCountrylist() { - + // function + func countrySelected(model: [ExchangeRateModel]) { + print(model.first?.country) } @@ -144,3 +150,35 @@ extension ExchangeRateViewControllerV2: UICollectionViewDataSource { return cell } } + + +extension ExchangeRateViewControllerV2 { + func createTestModel() { + let model = ExchangeRateModel() + model.country = "Nepal" + model.countryCode = "Np" + model.currency = "NRS" + + let model1 = ExchangeRateModel() + model1.country = "Kore" + model1.countryCode = "Np" + model1.currency = "NRS" + + let model2 = ExchangeRateModel() + model2.country = "India" + model2.countryCode = "Np" + model2.currency = "NRS" + + let model3 = ExchangeRateModel() + model3.country = "Japan" + model3.countryCode = "Np" + model3.currency = "NRS" + + let model4 = ExchangeRateModel() + model4.country = "Afganistan" + model4.countryCode = "Np" + model4.currency = "NRS" + + self.exchangeRateModels = [model, model1, model2, model3, model4] + } +} From aeb9c03ffbd0af272271de1c1adcd2d2ee153b88 Mon Sep 17 00:00:00 2001 From: ccr Date: Wed, 22 Aug 2018 08:27:27 +0900 Subject: [PATCH 3/3] --amend --- .../UserInterfaceState.xcuserstate | Bin 35232 -> 37777 bytes .../ccr/right.imageset/Contents.json | 21 ++++++++++++++++++ .../ccr/right.imageset/right.png | Bin 0 -> 671 bytes .../TablePickerTableViewCell.swift | 4 ++++ .../TablePickerViewController.swift | 2 +- .../Module/ExchangeRateViewControllerV2.swift | 4 ++++ 6 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 GMERemittance/Assets.xcassets/ccr/right.imageset/Contents.json create mode 100644 GMERemittance/Assets.xcassets/ccr/right.imageset/right.png diff --git a/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate b/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate index a908a41a41f959c99e5c6a5a21bec81168f5b9c4..3c999d9edac780675c7113a3c3e1bb3b120474f7 100644 GIT binary patch delta 16970 zcma)j2Ut``_xGK-T`9XuhXodvUKf@o(yO$kcMuRzQ3M4Pu&5F_ZX)m_^Jc<`Aoh)x;WNEwPSRPi!Ez5#JJfh`q#7;ydCPagn%0Tqdp%H;G%s zJ>ov`gm_B4A>I;y0RSK%0S^p;39tfoz!|sz1@HmBAPj_q2oMRPKs1N}u^=7ffqYO5 zx`Pr>4(dSz7^nt=KqF`Z&0rK54aR`6U>ukPCWGlf16n{USPWKxm0%TE2eyM9U_Uqt zz5^%0_uwoz2QGnY;0N#{_zCfvy!d>t*JOjUnXW=<`9$tVK;U#zL1 z31lLfL1vQ0WOuTJEF~+*L1ZJ@L^hLy$sy!Wau_*@{ z6iacG0cA*uC>do(*;8`LfpVmrC}+xr@}N8^AIg^sqQa?YDu(JtB~vL>I+a1?P`Okd zl}{B@WmFHUhN`9dQv;|vYB;5)1PW1KQDdob)D-G#Y5}#7TBN2{QLCvn)COuhb&xtn zouw{PSE(PVThtxuF7=RlO8rK?q25z}&|+Fb8_~wJ32jQ7(dM)TZArV(uCyENPJ7TX zbT>MIPN7wF2AxUg(s^_dT}+qJJ?NfvFS;*XP4}k<&?D%P^eB2XJ%%1jkE6%a(`mJa zUP>>cm(wfgmGmllHNA#jOK+vO(cjYB=@axx`V@VdK0|*`pQX>y=jk8l>-3NGPxKA? zCjEl`jebeLqF>W*=(qIm^gH@J0~wN`7*ocKF=s3oOU83Q_qZIMl)lWvCKGT zJTrlr$V_5pFf*BNm|4thW)8E4S<9?r)-xNJjm#!yGqa1?&Fo?JGH01{%z5SlbCJ2k zTxPB?Hpwv6q;mb1Os-fT77k8Ng$vBTMs?APoJb|yQAoy#s{ z7qQFORqSeZ2fLHq#qMVJuzT5k>=E`Tdy>7xUS_YbSJ`Xq4{G)fdzZb(-e(`PFWBGM zm+T+xpX^`k2ae=e&WJPP%sDA%&DnAGoD=8Fd2(KyFBi;(bJ1KkPQ_(#d0cm{2iKdc z;p(_1ZYZbbMsee~@!ULaKDU5d$SvYpxK?g4x13wet>-py8@a9AE^aq>fIG+?;?#$^ zW84|;d+scEhr7$&#BpFStLrKe@lS4?M$*crh>Gjd)|; zgg517yd7`P%Xv@Ui}&Ugd@$dY58=c4R6dPQ=QH?BK9?`x3;80xl<&#+;rsC;_%Zxg zej-1KpT#@N@Zj{35=EU&=4zSMjU)_522Y3%^}6mktNbn(Op1vPnqL6f%!M ziYAU73~V$9B5XF_W=T>#8{6tj*cQJc{sb&A03sj(#=sPq16vRbQnAI&1leFHHmj4s zENoCWfX!exI0SBDBS~Td$wC?uy2`VJ}kkw=j*`FLh)=9_)av-)t&DaJFBh@4#M`#*5+k#P=Z#qxs=L?I3)q=UO zZnLkRC-j|6I4mW`5#xyo#6)6};3BvRZi2huv6PrXOeLlf(+Q2>DP#y0!bD+`;8Y@# zX>J;rX%-oD23Fc9Dz2)gLStuUt2t&65;&J=B^;I!^N9Jx0%9Sth-eYK1aCnh_z1p& zav8ChSVGA0XF0J#@Dt*N1pG-9k~Ccnw-|0DHWQK-Vw2$CLTnKNG#?D5>g~i%!l8xO zAq2J%yM!RYsW?6*Hlwm%RYOBrO?l-7f+so=or!(KLBgSx*iRe~x(LCo#3B69RS5p) z@U)Kc$B8q9!xG{EagsPioW=t~gis+&+i;dRN1VqE;XP0KKmn#>1Ym{aPa{Alpx2>Vpf98dPVG~*Xw`P?7rL|nBSH1K z0|QvwaZ(6r0Tx2)=ME{b(RN%DB3gj0koLL5-UvA09v~OeKP}5v<5MS7>oyL!0uQ`4 z;0D}Z9+{|LseNrWx7_3Xxv_3*d|eAc|%ogO^Ha- z_A9f0WqDQ4s`4^zqlhRGnIy!-MwK;`_tu_^tjeZ_w)t5-@vqAu4#b0QAOR$*iOwJi zBm)3c*dC<`p`H%L`E3c`osnn4!1!W~7n=kd#M!H>v zYMl;SK@TmH|2a%Is$%j&LfQ?`i2GbU>6>J0FYR(yFvBQLM!cbwX#=|5yd?(nq z1nk0IW)Ija3>T0vQWzzSxd0A;gLv*CA_^QSNT|>riJn!Jb=e6u6_rhb8tY3a5xFX4 z7$8K1tn9M>?Wwqz?fp`lFWQ95d;z-e$q_(~Wd2zgn(>nh7C zWIiIQgVzKtFT4^=x})iGThnN5lcvhl!~A+HF@o?nQh(I_>3H1$H#KWbJ;5!_b<=K| z8wQT0;4XMUIIITuh(+K5cnBVW$KY4+1Uv=Lz;j_T_Bd07slqg2x}Xuh7G?-Dg>P14 zM7+crehuD$x7v@^8-ceN8?&&sXA5(Lxosbr)GDv}GTG>@FRahge)r44P z7UaSngu^PB2lHV8EQCd{7xB)%Mq!h%S=b_M6}AcA3fot~a#%sg@F$9h zf>p2&>t)lgd}j~HW4X#YCYI1SGD*W8(S z?kr(Ho_j#BFA*8y*)f$p2KI99RaqB_0V|KlZ=>;v$b7g^E9(N`Pzzin9M(*h`i3rn z%d~Avg(EF+xo{La^pvuy4tE4s!}XXgTm#p_b;5VTG2!@PxB)9>lW+p7;W zu&)K~5KiKQsPl(7zB^1fEQfpGUbqkLhX>$6ct|)UoEFXq-wS7jbHe%M@CZB#zk|o% zad-lr6fOuCg*(Cv;eqg*@KUo*K2;NCV-tQE-XJ8);T3olUV}g2knuK}ep+T*vPls5~;Y&i&3SYqAgd4)m zR`?3O7H$bY3-;MPYpW~jyI0hf5A27HM{;FNuZG?_V7~|Z771g-6eHiS(l4gnwAJ{PrGR$PU3@p1c!HXJ~!=e8`b5DQ6$DJ9`!`q^mki+fpjD~ zlTM^F=>k-mCo(hcnebe|ZhnyFhEt5@Y^1H`RD==VW)4UX(o?f8%#>~=y$FBpQ|H`z zt<7|CEfINYL`tbjF3`z$gKBbCf1bI4rbgYXdnVlkOd zM3IFE0Kp6aCk)o|QnC!Y9I^)j@YA^@E6IKsu4GTL7ulPv!Z}D^vKj#r0SW;c0R{mU z0S*Bkqn4~~%T5N6^<;x^0f9~kSRf#8`_BOZM~vNB>BGs<7`HfQ5pdS>6*+<&NsdCG zGXi=D=p$f&fFS}R1jNh9G2~cs9F}q{ewu`U1OX!ijJ5LOZ~V(dd$R2{c8<21lbJtj z#ygs*=aBQ;U`);vZXjUVN-iK5B7kR@3-8|xS8CAfNcx8 z2LYL8s8h1I9dZY?kVC*;c&@qTbk6<@*c`+RU*R4d&(qp%IfH<+=9IIY`aF60-_ ztLYj7u3F_}2<`KJ)FSIA1l&H0d5e7T|GAyyL-G;%nEaJ|LOvy*A>fXH2LdsuGe|`s z9)UCj(lxa%fj%$E-wDYQ@)h}-d_%rPz!L#41iTSYEFs^K@5w*NKN0XjK#71K0)c|P z=8=Dc9z|l|C=4QBVT>l%)k8w@RA;Oz3WLVKg~DJ6(5wis$&^P_{mo8OVhX1y%P0wD zL>W^ilqrQ*9E3m@1cDLhia-bgq01->%9668q?9#*;TMKLI06v};Qfro&RP^WT{Fu~ zp{885GPofSDU2!b@6*pynd_O??ALzYC@;#Ja9FfRaFT~V`qn2yxw`%fj8IC-PiNc^ zNI@W0Yu?&1LUqBB7!^!)r9!As1mY0rhCl)WNuLZH`2-9ANASUk$APM#QMpTdwZ&C9 zRn=Ol&@T)Zm7r}xAn`ve7igPAVVr75B>%?<9nh#u9ne%5Xy@G5ID7^gm8k=ostssV zcdb535Xi)P(&Az3RZjKBu`*RbRZ=~vUI=6(kb^)j0(ncQDyk27Lt$Hxk3e@}4g#f` zrydb*^;DB~N&_{J8bmcBP=G)o0!0WEYp(^ONNwPophc;fCf9RB=MmH>?WT`JphR=m zQ=UGanuve5g-{ee@@4HY6g3qG4b(JhIs(`{Remy0)C_9&KV3gHhmcY85GWVS5vb7Q zdr9+JsHOiJwG5A1fk02~s9rd{$f)YoyCJ8lvQZu}MAQbk4jind*6DC?k=jUYqBawq zsVzW7ZKJ-`oc2nVH3$R(eGq88Ozog{;?7;vZfXx6u!Y(W^{4}yF5cMsFw9D7LW1a*=+MV+Sb!S9Da4Fa_Y^hY?$>4@pSbdw#<@PGJ6_5bN0 zDI6zgQB?OoQKa*bLYsH|+fu1Vc(MC&Qi>B(1O{r=F-RbEhYe^E%m$Rrox4Mhg)wdoHPm_yV5^thHzL({Y8DCKGFmYXh@SZ zMbiijMqmg6LlGE;z;FcA2nYxu1io5H$Z3w|=}vTKT94MJ4QN9FpS%$WEc_7+2RO59a)b= z`_f9;! z*jxmbBCrX80|;PrU<>~Uf!7F92#N#~rwgCYHyy7#-{Une>PDD;(VnbppI9PlY!7q% zjK1hj*L6?UTz6_T{*qpfu4Ag^&w=~Dq*thGpI#!$YNI#5QS`TY+G_~x(7x8(imv{0 zUZt*mW{IdDo|mLqG(i5P9DQ`%vos|!m0wP))wRzl5oNcrvxznDM%U4Uv2Ua6=>~cr zJ&10ko9Jc)uqBv}zybtt9Iyz176e*xU`!AFGB8G9@fVTtfD{^NWSOj*oo6BcSM0_(IgAh5CR$40?vbA5^)P}A$^jXEJVXoXmhg`hVJw-DIyuZTuWT8YFR zqU@j#Xhqpc@1l3pd+5FNK6*a_n-SQ801i*KA@D5%+Y#8YoIXe&q7TzYuqfYYMcIkK zE(G=>un!BvAb_WB+&mzK0cxg$_yrorAUIo~FKK1kt(EDjR;E4wmPz_S9wF7aaM3D} zZ3l&0v^Ef-f2Mz-Z_{_^yYxN!J^}|3IE27qq_spx5%>;)W6SA>^doH;NIx>ikIxV| zj=+ibI1qp1Une(%R2n#mB%)3oQ=mh*rE8r;{2Qoxk9C%t&on)zEXht8iXBdWM zIEH6BF`XG4a(s`#Sp?1@a2|mR2wX(q(sIUtF=RxH82@X)7$a~Qfh!1HMF59e_yPa? zp^d%fTC%AXW6wCY@nsyee6MTyI=AutQNyQLB{Lq3pO&vD{B-4lKr{h+w<@Qp`t+tKZtAFjj=tcX6Fb&L5tq22|K};jl#56O5 z8EnGeAn+D}-w}9+za*o8OX0$lKxQE(+lChpIN{xWEL?kOe=yk zf((Kzf*gW8f}IfTyd1n?mbUH73KRUe0!KbjuWetTq4wGE)3#VLTbOTkVr|1>L4B=Q zJG5dMXd*MMyD|Hi@3cJkGY6Q1%pvA5bA&mHpcp|3f<_1$BWQx4DS~Ey-<30e+ZAZu zwkuZ5Rpz>m*$-M~7TR6Gj=>B;OU>yls}SZF<{sg&n7Pf|VeTR*MbHL8*<$8C^MHAX zpgn?K2*%=j{m)*2dD>=Wp|xg_vh)k<%e>UJ+m?uWv>Rww+QAVSb$(p1bZRafAfJL z8c5jvEUv1yum=z*%o_@J&s^8g5{sGE%p?97UxmyY4!~JJ%Zg4 zEJ3hzF?)`Xu@?|5!>JVPp+WizO=+;7BYT~_`Cp@N;nBY!SfL$Vso4?iq+}mxm4&TP zZ(+_?8!?Cxquae#xGpSyp?@3isB3T5WQ2xDI2X3X@Zkj+`Iok84DLGv&IJh(x$VScYqqb!9d6<#kp48}f0Dva$)6ReK{S z2n2R(^#~5Xz;)$9aN$Fb3+2KzmSJwGP**DCBDlyxRc2eMNIR*Oiz58LY-mgAxEL-L zS6uN8dva~Bn2vkmT3s1$F&D?hYcyd&YA%6G`n(K$%D!qp26 z$vRLgtL_?|%jXI|6DvY+R0pvVEwNGrNB@JEx=k&z&(yHJ`9!UX!$rmp4P)et?Vwhx zrPd$8asQy!M$D1JG<2dhBRF2G#%5e<`-L0Kh2fIJ7mAB1YltsHa01dQ)`RHG4I{jw zLOTn39m^58ue1VSP)%y#Mj$xl@3T=9_ucmTbv#xBY@1Qb)(-02J zxry8)ZZbE8o61e&rXx5N!D$HM2MvN>BRB)WnajDaxf$F{?i+3vH=Dy@%QpzlMsO~I z^AMbmAhte>wfU`??(kJsBs5g^`&>L!*B92;4y-G$)Hc^+oK;jdlvP!KQNOP**OsPh zdU=-NS_>Ya8}3sf$6>V8S5{~XGR3unD(eQ}5TULAJhucxdI7hrdu?4s zWnE=OYL7nH3e>knG_%^#xq@4Xugqg|vf68~sk))K6uX35r7gy4%gq1T-{#D?HMqRX ztwnH-fZq!+_VO+-uk)_cUITem^(*UzUms}D){vtTqT93i)OHD@)t_Ee=+OKoZu8&G z$Tn`fc0;kTw5nB3 z2b&|@Q7s!QjE?qmaGX1dU;f}uAh@)JJB8pf&HF6JOzs@_10h+#o#!ra7r9H^W$p@h zmAi)E3ItaoxC+752(Cd8FMb_@>sN5s2^k^hZg4lbTinlt48aY!a)wPO_9&YW+>GFs z&2`yQ;P@N&21k+HOYRl-8o_M{;stJB%)RA)=iVWR*LexS!kh0|fUXh}E)RQfIYL7Ak1~!MK|G<@PRyz>hPAFMDUbmZ=MCq^&%s_mhaCG;On$G28ZYXzL9U@oB6@~5Pm2>jMKv&wG+o9cpbr?5WI=t z&$=`OTRrWC7rc$&T?FqV_z=Oz2tGmZDfYW<-WU7eI(+k~jf5n++8RGvXB2<@d#TR& zi!_9vpc``Ii)*egyQk{9Z~gb}6F)=O{mVZt&-gjI_B)?%pCn&6dw!v=``$k<&-f*} zjt85EH}nNx&S($n9%*mYzHDEooA9eP0dxBz2z;h%uWD0AyEeYnwLSZM11DGWyZGJN znGF~Q0w6fTg0Lst34bD(2xsK@rPu%_j7h+6zh>k6fPAJqQ;Oe$t;FxSF2?V)?!oEl z0i2Z{VZLLI9+B5qhKa#^{aHo1iyIZ;IYDy(N0f^j7Gt(p#gqPH%(WCcQ0s+w`{U zozuIcZ>;aEAF5xi->g4Te~$h<{rUQ<^w;XI*WaYSMSq+A3H=NDSM`6;|55*j{$u^$ z^k3<}(f?ilqX94=4QK<_z{J4bz~3OiAl#svLAF7GK`(8Sd zh+0I8Max7h@Kx7tk@~pkl<17;oaln+lIXVRx#+d%t>~TTgP0IQF(sCWjl?pstJq!a zDfSloh=au;;xKW9I7%ENP8Mg1^Tj>IeZ~F6wc-ZxAaRp;uz0jsBc3UqC7vsuFJ35K zBHk$8BHkw6A>Jk4BfcYkA$}wNUHo4BQ352SgqGNp0lEspxk`@^Nbf5FEVa5-fR4w@lE49#($a^n^>6Gn?##*GpRBeWHQ2Jl*t&A zaV8T?CYekznP;-VWRXd$$r6)gCM!%Fn?_R#{5t74;F+4wD7VBw8*h2v>0qL z#$ues1dB-)Gc9IWEVWo}vC?9-#deFG7P~F>TKr=1*y6dxJ4dD!x(mZvPwSe~`KZ~4&jvE>uB8Z})dwjn<)odYdQuaqsnlF*Cv}o4r9skQX^1pZ z8ZC{L#!E}2NIF?MO{$U3l+KdQkuH|5lCF`ilWvf1lJ1ipl^&Cxke-rWkY18rkzSKt zmp+xgwN_Ksovrn)4Xwr2=GK1?BKV`w9`F|u*7akKHT z@v>3a_}ci{1lV-339$*ciL}YKsj)#eQ*4&mY*gDEv$^Eww1QMY-?=$+t%4O*bcH4Y{%Kow4HCe(6+^PvF$3`HMZ+) zH`s2nJ#2g0_6OUaY;W5BVtdE-p3FdIC9{#qWOA9K%vt6k>mrMgMag1hak3Oysw`cW zDN|?5kZiVWqim;ak8Gdpfb5LyC)rKe&$8RHyR!SThqA}A_p(1_AM6M_Xh+#GcAQ-& zJ2N}EU6@^lU5(vDyIFSY>~`6musdaU#_p`$dAo~tm+h|F-M4#a_t@@<-7~uvb}#K- z+r727u@AK`w;yA_*8aTxd;34-yxc%8l1tQbGr5J_N^UKe%YEftnXau7QhIhZ(@ zIXE~tIk-5uIRrX%ap>w0>X77+=TPBL6z09 zXW&dZv(BBI^_@k|M$Y!m4$jWbZqA-+XN9xUIlwu{Io3Jdx!PH9p69&N`Ka>+=U<%f zIzMoJ?EKXEh4U-tw=Rqe@1o~o=puG8b}@6YbdkD5x>UJLaoOy0&6RMqb+vPqyLz~G zaSd~gaE*5D=9=WHa!qqBaqaC|<=WS^#&v}2XxDMB6I>^`PH~;(I^T7X>tffXuIf#$ zTV1!i?sDDhy5IGZ>z{7Co1UAYo5an;&CJc-t<+3t(n7rQTYU*W#WeY5*E_Z{xL+>g0masR>nC-+9b0U_Cl{=zEAfBx;Xvk7SQ*k35e;kM1629(_FedGzFKHPRC)$@26<+A7JK&bZ1f!LIm}b=9N{_I zbDZZ)&)J^yJQsSldM@=`?zz%)i|2mNAH0Bw?#1uWMe{y&iZy_Il#=%$xT%^)~mm^p<+N zdV6?#c`Llbypz0D-f7+$-lg9Cy!(6Cc{g}p^S-UHR=6oV6kZA+MX(}N5uu1ugfr=)@5XDHv7{z$SM8y=vG{qdn618Hz;ycAf#ZQV`irb2Niie8d6t5I-6z>#& zDE{)X@(J=O^l9)xJ|lg`_>A|N=rh@;)n~oWCZ8=n-}>zI+3j=0=Y-E`pR+#aeQx^P z^LgO&$mds|mp*TNe)svq=PzHz*U(q$EBAHub@p}jRro6L4Qh~Yuy2fSif@5$p>L6| zy1Q?!??~STzB_z(`|kBU;CtBjC*OO%Pki4grAim2o6=LMP%4$(lu1gJGEJGG%u*IB zdn@}YYm@_&4a!DkvvRa@ta7|^qH?x!u5!L|p>mCKopOV6lX9Q(fbx*?i1NJhlJbi3 zn)1H#mGX`9cjbFOBR^9=b3ZFTYdb{7d|M_*eS(_V4T8&wr$Ui~lP!>=fP#aJeFfgDgU`W8|fN=p61EvH_510|~O~7}7AkaN9C$K!QDNsE) za9E%aI3jR#;JCnvfl~sf2hIpw6}UEVL*VAXZGk%icL(kZJQ#Q+@L1r9z$<~*0&~vkhqWqA*(}nhU^L1A95(SWZJsB=*lqJD|G6ZImRh$f?%Xg*pm+AvxYZ4&Je?HuhE z?HR3zRz?RzcZu#AT^c<$dR_GS=-*>(W5Qx0VxnS_Vp3uXVoGAlVk%;)Vya_mV+ObAPu*>1mg zd!N82=p`5=h!ac`%oD5Ff)hd#5)$$f3KO~~lqFOo^h)TH&@W+V!tex? zFd|`8!q|lI36m1kQxdi%TuS&O(KazQu}|Xk#D$4V5|<^eOk9_^A#ro!*2Ke!-z6ST zyqtJ9@j>F_#HWcb5?>|0O?;okCv{HJPclprCmAJ~B$+2!CWR;UN}80kG3iRuhh*zy zw`A{RpJcz}F3BOu;mMK7X~~(%rOCaL`y}^E?w{P4JUDq+vXK0hI(bU+v}8^4%;eW8 zFojBCQuvgblp!g@Qq(D5rMy*9Dt(nmWu!7yS*Yw)jw% zm8Ysy^;Y#&)u;xj8dQy{k*YDO@v2FxsVa?XhUy#DBGpONMb%HLTdLctd#Z=3$Er7} zxJ;aCmgyR>gd!tsryr}rT&t7 zH}yg4qtw@FhH26?+cf($$26BTx3svl%(T+9^0c05RcX~}wP|%}>a?%YMx~8Sn~*j+ zZED)|wE1Z((+;IQN~hAz(q-vM=~?Ny=>_RU>AlkN|COUoAC%sdj?yQmf0I5ZeSZ3) z^u_6G($}YNO5d8kJ$+~Tq4cBa$J0-yUrxWBelPuD`mgEF(qE*1$mpD5kRi@6&M?cc z%&^XI%ka!lWGFKNGP-1R%?Qni%c#p3k}*63WsJy}oG~|JUdH^4g&8X{wq|V4*p;z2 z<3PrtjI$Z%GcIPRuVgxB`elY^MrFokcFRo4RAuI87G;)X_Qcmi?i2eZ^+)9 zy)Ao34xb~*vCVPFan5ne@y_wh@y`j&3CoGiDaa|$8IdzSXI0MroYOgHa=yb`q&0CkZF>g!W zfxJt35Aq)6J;{5M5A)f4qkL(;e||`Qc7EUdru-rK!}C%8$o$dyQ}UT*Ns$hD-jDlGOa|;#}EGk%A zu)bhp!Ir{Kg=U3Lg|3Ajh2Dj}h5m&>gB8%UcM4w?zA1cHq=rQnMfOEqilT~Qi@Fsh7L^sDqRB;5il!D#FIrgCTC}ui zMbYY_wMF}ijuo9QI$Lz1=u**@qMwQ$6umBbQ}njzT`^P47wZ)p7E6kai|vaQ#i7Nj z;`HLI;@skb;^N}c;_~92#f`;-i-#5uFGj^9i^mj?FP>ODxp-Fb;^N)v;tRzOivQ|v z(%q|jO!raUCwA9#U(kJZ_f6fmcHiE8SNDV6k90rQ{bcvkB}9o;iC;-*Nw<=u5>-ih zNmfa2Nq$Msl71!qOX^Dol?*EpN=B57E*V?0vE*iH=ThTRt5Vm}fYQ*?h|=iNxYCr; zw9?GdoYK6~veNR>s?tHF!%Brx^@!5ZrISjhmTF38md+||DP2;!sdQiI(bD6kr%Jys zy&^vBYhr9YQGDt%GL;e4#S;?-y8mN`0L?shrd_n st9z<@tNWP*B;vRMHS!dn5 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 a>i5t1UgP#>KzR)=4c1cQ?w-rK?+)L$ z`^+NeE6EVo-}BC!jQpRIU~Ft%jZX z%}bPnMi~73c-%{@Hiue?yuVF|K! zH$LAieC{Z;9(_XaqW5N5F6(P6!9JsO9zNHD&;L2e=0qN2sHbL4e(TjHHdA&Y{f2#C z$ELy0z35MHug&&>l_qVS2Y(X&z$WZD?9aVf*F8zTpqyD-W6K=MzhRBU_Advegs}5) zYpi_HOS64{1)Xzf>#(85fE)&8p|lA7XgQl813Wh?r}uhrg-v)YLMuT<+^3qbS+Op_ zBV%NcM`ru}!w$7}L!kIs4lGFMOh2Z*GTUd^_Jgp)Xjwv6VY&`xhigN&7R1^csm65u z%?<-vh|yJ;cEN0&P1n<`E2i(RTQ{!9J+s3%{jDF@i`aGR&P2DrX5-`J=!)b z7Nu6Y8nbSiE=J8}@x$QvZNhD^TZLJ7O^a`Os2Dd}D%Ywo>$>TZRVYlM3bXE;M(7`C zx;nG&o3;V^tIo0rn?bY0W3&B3i!!vy4??BO=l$)X0INg!wHKN;UlG{;2Tb3!kQOtW zPrxs-17LrR58h!!1A{4~F*>tDW>|FK2kS<`C>RB!007fD(y18h8dCrO002ovPDHLk FV1jgMLGAzm literal 0 HcmV?d00001 diff --git a/GMERemittance/Library/TablePicker/TablePickerTableViewCell.swift b/GMERemittance/Library/TablePicker/TablePickerTableViewCell.swift index 0282d987..ffb95b4a 100644 --- a/GMERemittance/Library/TablePicker/TablePickerTableViewCell.swift +++ b/GMERemittance/Library/TablePicker/TablePickerTableViewCell.swift @@ -26,5 +26,9 @@ class TablePickerTableViewCell: UITableViewCell { if let image = UIImage.init(named: self.place?.countryCode ?? "") { self.avatarButton.setImage(image, for: .normal) } + +// let isselected = (selectedPlace?.country ?? "") == (place?.country ?? "") + let isselected = false // dont show tick at this time. not implement for country picker this time + self.checkImageView.isHidden = !isselected } } diff --git a/GMERemittance/Library/TablePicker/TablePickerViewController.swift b/GMERemittance/Library/TablePicker/TablePickerViewController.swift index 96ecac4c..17ca20f2 100644 --- a/GMERemittance/Library/TablePicker/TablePickerViewController.swift +++ b/GMERemittance/Library/TablePicker/TablePickerViewController.swift @@ -1,4 +1,4 @@ - // +// // TablePickerViewController.swift // Sipradi // diff --git a/GMERemittance/Module/ExchangeRateViewControllerV2.swift b/GMERemittance/Module/ExchangeRateViewControllerV2.swift index 8e1d6570..f693b2ef 100644 --- a/GMERemittance/Module/ExchangeRateViewControllerV2.swift +++ b/GMERemittance/Module/ExchangeRateViewControllerV2.swift @@ -26,6 +26,7 @@ class ExchangeRateViewControllerV2: UIViewController { @IBOutlet weak var backgroundViewCountryLabel2: UIView! @IBOutlet weak var countryListStackView: UIStackView! + var countryListTapGuesture: UITapGestureRecognizer? var selectedPaymentIndex: IndexPath = IndexPath.init(row: 0, section: 0) @@ -33,6 +34,8 @@ class ExchangeRateViewControllerV2: UIViewController { var exchangeRateModels: [ExchangeRateModel] = [] + var selectedExchageRateModel: ExchangeRateModel? + // Life Cycle override func viewDidLoad() { super.viewDidLoad() @@ -59,6 +62,7 @@ class ExchangeRateViewControllerV2: UIViewController { viewcontroller.data = self.exchangeRateModels viewcontroller.type = TablePickerViewTitle.country viewcontroller.doneAction = self.countrySelected +// viewcontroller.defaultSelectedData = [self.selectedExchageRateModel] self.present(viewcontroller, animated: true, completion: nil) }