From c03b30f1128af9301c7162d3fcfe92fc649ba31d Mon Sep 17 00:00:00 2001
From: Amrit Giri <amritchang@gmail.com>
Date: Tue, 10 Nov 2020 14:53:34 +0545
Subject: [PATCH] issue fixed

---
 .../View/ExchangeRates.storyboard             |  8 +--
 .../View/SendMoneyExchangeRate.storyboard     | 52 ++++++++-----------
 .../SendMoneyExchangeRateViewController.swift |  2 +-
 3 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard
index 2e2d0b5c..dfcfe073 100644
--- a/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard	
+++ b/GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRates.storyboard	
@@ -155,9 +155,6 @@
                                                                                 <subviews>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You Send" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4fI-sm-Mws">
                                                                                         <rect key="frame" x="0.0" y="0.0" width="307" height="25"/>
-                                                                                        <constraints>
-                                                                                            <constraint firstAttribute="height" constant="25" id="zcD-5v-3xd"/>
-                                                                                        </constraints>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="14"/>
                                                                                         <color key="textColor" name="ThemeBlack"/>
                                                                                         <nil key="highlightedColor"/>
@@ -287,10 +284,7 @@
                                                                                 </constraints>
                                                                             </view>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recipient Gets" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TKl-fU-d4w">
-                                                                                <rect key="frame" x="8" y="139" width="140" height="25"/>
-                                                                                <constraints>
-                                                                                    <constraint firstAttribute="height" constant="25" id="nFD-Wv-XAd"/>
-                                                                                </constraints>
+                                                                                <rect key="frame" x="8" y="147.5" width="140" height="16.5"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeBlack"/>
                                                                                 <nil key="highlightedColor"/>
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
index cbe1f4b9..340c3780 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard	
@@ -38,31 +38,28 @@
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="sHP-5O-mqU">
-                                                <rect key="frame" x="10" y="20" width="355" height="394"/>
+                                                <rect key="frame" x="10" y="20" width="355" height="413"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lzg-G5-Ik0">
-                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="394"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="413"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c2A-Ng-UY7">
-                                                                <rect key="frame" x="10" y="10" width="335" height="274"/>
+                                                                <rect key="frame" x="10" y="10" width="335" height="293"/>
                                                                 <subviews>
                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4cq-dF-Ccj">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="335" height="89"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="335" height="81"/>
                                                                         <subviews>
                                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="n89-P3-Sev">
-                                                                                <rect key="frame" x="8" y="0.0" width="327" height="89"/>
+                                                                                <rect key="frame" x="8" y="0.0" width="327" height="81"/>
                                                                                 <subviews>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You Send" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g0v-R4-hwl">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="327" height="25"/>
-                                                                                        <constraints>
-                                                                                            <constraint firstAttribute="height" constant="25" id="4Nu-0d-FhJ"/>
-                                                                                        </constraints>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="327" height="17"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="14"/>
                                                                                         <color key="textColor" name="ThemeBlack"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N88-OZ-ngd">
-                                                                                        <rect key="frame" x="0.0" y="29" width="327" height="60"/>
+                                                                                        <rect key="frame" x="0.0" y="21" width="327" height="60"/>
                                                                                         <subviews>
                                                                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="sib-bH-gy6">
                                                                                                 <rect key="frame" x="0.0" y="0.0" width="327" height="60"/>
@@ -176,17 +173,17 @@
                                                                         </constraints>
                                                                     </view>
                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HD3-3z-Nkp">
-                                                                        <rect key="frame" x="0.0" y="89" width="335" height="125"/>
+                                                                        <rect key="frame" x="0.0" y="81" width="335" height="152"/>
                                                                         <subviews>
                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wnN-Ic-xTs">
-                                                                                <rect key="frame" x="158" y="0.0" width="1" height="125"/>
+                                                                                <rect key="frame" x="158" y="0.0" width="1" height="152"/>
                                                                                 <color key="backgroundColor" name="ThemeText"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="width" constant="1" id="ajd-rk-zaU"/>
                                                                                 </constraints>
                                                                             </view>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recipient Gets" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZOx-YH-xNk">
-                                                                                <rect key="frame" x="8" y="96" width="140" height="25"/>
+                                                                                <rect key="frame" x="8" y="123" width="140" height="25"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="25" id="Bex-se-Z4S"/>
                                                                                 </constraints>
@@ -195,16 +192,16 @@
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="OGQ-3I-1Ck">
-                                                                                <rect key="frame" x="153.5" y="16" width="157" height="93"/>
+                                                                                <rect key="frame" x="153.5" y="16" width="157" height="120"/>
                                                                                 <subviews>
                                                                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="qh4-UU-QdD">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="157" height="36.5"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="157" height="50"/>
                                                                                         <subviews>
                                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RNy-6S-yRb">
-                                                                                                <rect key="frame" x="0.0" y="0.0" width="10" height="36.5"/>
+                                                                                                <rect key="frame" x="0.0" y="0.0" width="10" height="50"/>
                                                                                                 <subviews>
                                                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FC0-rf-azm" customClass="CircleBorderedView" customModule="JME_Remit" customModuleProvider="target">
-                                                                                                        <rect key="frame" x="-2.5" y="11" width="15" height="15"/>
+                                                                                                        <rect key="frame" x="-2.5" y="17.5" width="15" height="15"/>
                                                                                                         <color key="backgroundColor" name="ThemeText"/>
                                                                                                         <constraints>
                                                                                                             <constraint firstAttribute="width" constant="15" id="LHx-Hi-p0V"/>
@@ -225,10 +222,10 @@
                                                                                                 </constraints>
                                                                                             </view>
                                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W0o-oR-SYp">
-                                                                                                <rect key="frame" x="15" y="0.0" width="142" height="36.5"/>
+                                                                                                <rect key="frame" x="15" y="0.0" width="142" height="50"/>
                                                                                                 <subviews>
                                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Svp-2o-XlB">
-                                                                                                        <rect key="frame" x="0.0" y="0.0" width="142" height="36.5"/>
+                                                                                                        <rect key="frame" x="0.0" y="0.0" width="142" height="50"/>
                                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                                                                         <color key="textColor" name="ThemeText"/>
                                                                                                         <nil key="highlightedColor"/>
@@ -245,13 +242,13 @@
                                                                                         </subviews>
                                                                                     </stackView>
                                                                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="c7r-St-R5r">
-                                                                                        <rect key="frame" x="0.0" y="56.5" width="157" height="36.5"/>
+                                                                                        <rect key="frame" x="0.0" y="70" width="157" height="50"/>
                                                                                         <subviews>
                                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jxh-jK-578">
-                                                                                                <rect key="frame" x="0.0" y="0.0" width="10" height="36.5"/>
+                                                                                                <rect key="frame" x="0.0" y="0.0" width="10" height="50"/>
                                                                                                 <subviews>
                                                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fx1-rp-6Oc" customClass="CircleBorderedView" customModule="JME_Remit" customModuleProvider="target">
-                                                                                                        <rect key="frame" x="-2.5" y="11" width="15" height="15"/>
+                                                                                                        <rect key="frame" x="-2.5" y="17.5" width="15" height="15"/>
                                                                                                         <color key="backgroundColor" name="ThemeText"/>
                                                                                                         <constraints>
                                                                                                             <constraint firstAttribute="width" constant="15" id="1cq-yu-MzM"/>
@@ -272,10 +269,10 @@
                                                                                                 </constraints>
                                                                                             </view>
                                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8ww-qE-dki">
-                                                                                                <rect key="frame" x="15" y="0.0" width="142" height="36.5"/>
+                                                                                                <rect key="frame" x="15" y="0.0" width="142" height="50"/>
                                                                                                 <subviews>
                                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N6B-4o-HsG">
-                                                                                                        <rect key="frame" x="0.0" y="0.0" width="142" height="36.5"/>
+                                                                                                        <rect key="frame" x="0.0" y="0.0" width="142" height="50"/>
                                                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                                                                         <color key="textColor" name="ThemeText"/>
                                                                                                         <nil key="highlightedColor"/>
@@ -307,7 +304,7 @@
                                                                         </constraints>
                                                                     </view>
                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e2W-Ib-c03">
-                                                                        <rect key="frame" x="0.0" y="214" width="335" height="60"/>
+                                                                        <rect key="frame" x="0.0" y="233" width="335" height="60"/>
                                                                         <subviews>
                                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="FrC-uH-uAy">
                                                                                 <rect key="frame" x="8" y="0.0" width="327" height="60"/>
@@ -446,7 +443,7 @@
                                                                 </constraints>
                                                             </view>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y2T-0J-Buu">
-                                                                <rect key="frame" x="10" y="324" width="335" height="50"/>
+                                                                <rect key="frame" x="10" y="343" width="335" height="50"/>
                                                                 <color key="backgroundColor" red="0.92941176469999998" green="0.1058823529" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="50" id="IrV-69-zjr"/>
@@ -472,9 +469,6 @@
                                                         </constraints>
                                                     </view>
                                                 </subviews>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="394" id="B6d-6Z-XeV"/>
-                                                </constraints>
                                             </stackView>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
index 42c96900..da688bd4 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift	
@@ -128,7 +128,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
       
       transferFeeInfoLabel.text = "\(transferFee)\n(\("transfer_fee_included_text".localized()))"
       exchangeRateLabel.text =
-      "\(model.exchangeRate ?? "")\n(\("current_exchange_rate_text".localized()))   \ndasdsa"
+      "\(model.exchangeRate ?? "")\n(\("current_exchange_rate_text".localized()))"
       
       self.showExchangeRateInfomation(isHidden: false)