From 9c5fdff7dd9a5ddab830c1c002c4c32c6b04ccc3 Mon Sep 17 00:00:00 2001
From: Jeongbae Kong <jubakong1@gmail.com>
Date: Tue, 21 Apr 2020 17:10:17 +0900
Subject: [PATCH 1/2] Done adding moneygram, fraud warning

---
 .../Models/Response/SendMoneyReciept.swift    |   9 ++
 .../View/SendMoneyCode.storyboard             |  46 +++---
 .../View/SendMoneyCodeViewController.swift    |   4 +-
 .../View/SendMoneyReceipt.storyboard          | 147 +++++++++---------
 .../View/SendMoneyReceiptViewController.swift |  28 +++-
 .../View/SendMoneyVerification.storyboard     |  48 +++---
 .../View/RewardGroup.storyboard               |   6 +-
 .../GMEAlert/GMEAlertViewController.xib       |   2 +-
 8 files changed, 159 insertions(+), 131 deletions(-)

diff --git a/GME Remit/Models/Response/SendMoneyReciept.swift b/GME Remit/Models/Response/SendMoneyReciept.swift
index 1b8690c5..78aa6b23 100644
--- a/GME Remit/Models/Response/SendMoneyReciept.swift	
+++ b/GME Remit/Models/Response/SendMoneyReciept.swift	
@@ -34,6 +34,10 @@ class SendMoneyReciept: Mappable {
   var couponName: String?
   var discountType: String?
   var discountValue: String?
+  var logoUrl: String?
+  var logoText: String?
+  var showPartnerLogo: String?
+  var note: String?
   
   func mapping(map: Map) {
     paymentMethod <- map["payOutMode"]
@@ -60,6 +64,11 @@ class SendMoneyReciept: Mappable {
     couponName <- map["couponName"]
     discountType <- map["discountType"]
     discountValue <- map["discountValue"]
+    logoUrl <- map["logoUrl"]
+    logoText <- map["logoText"]
+    showPartnerLogo <- map["showPartnerLogo"]
+    note <- map["note"]
+    
   }
   
   init() {
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard
index 77fb43f4..d89ec15e 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_0" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -22,26 +22,26 @@
             <objects>
                 <viewController storyboardIdentifier="SendMoneyCodeViewController" title="PennyTestSubmit" modalTransitionStyle="crossDissolve" modalPresentationStyle="overFullScreen" id="qLl-8V-Zim" userLabel="SendMoneyCode" customClass="SendMoneyCodeViewController" customModule="GME_Remit" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Gqk-Nu-VeH">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6HB-NO-P3C">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="glg-iv-MSv" customClass="ShadowView" customModule="GME_Remit" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="113.5" width="320" height="454.5"/>
+                                        <rect key="frame" x="0.0" y="162.33333333333331" width="375" height="649.66666666666674"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="151" translatesAutoresizingMaskIntoConstraints="NO" id="Lij-J1-Kzh">
-                                                <rect key="frame" x="0.0" y="0.0" width="320" height="424.5"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="375" height="619.66666666666663"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cMi-WB-l6k">
-                                                        <rect key="frame" x="0.0" y="0.0" width="320" height="173.5"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="375" height="368.66666666666669"/>
                                                         <subviews>
                                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="grq-kj-9ru">
-                                                                <rect key="frame" x="20" y="130" width="280" height="44"/>
+                                                                <rect key="frame" x="20" y="129.99999999999997" width="335" height="44"/>
                                                                 <subviews>
                                                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="4 Digit OTP" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oez-3d-bvG">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="280" height="44"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="335" height="44"/>
                                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="44" id="wig-XX-Cwa"/>
@@ -53,22 +53,22 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4 digit OTP code has been sent to your mobile." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="zwG-M8-9S2">
-                                                                <rect key="frame" x="20" y="20" width="280" height="70"/>
+                                                                <rect key="frame" x="20" y="20" width="335" height="70"/>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
                                                                 <color key="textColor" name="ThemeText"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="jkc-rY-cKa">
-                                                                <rect key="frame" x="110.5" y="204" width="99.5" height="14"/>
+                                                                <rect key="frame" x="138" y="203.99999999999997" width="99.333333333333314" height="14"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Try again in :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iIg-Bj-Ocp">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="68" height="14"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="67.666666666666671" height="14"/>
                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                         <color key="textColor" name="ThemeText"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jc2-Jf-Akf">
-                                                                        <rect key="frame" x="70" y="0.0" width="29.5" height="14"/>
+                                                                        <rect key="frame" x="69.666666666666657" y="0.0" width="29.666666666666671" height="14"/>
                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                         <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <nil key="highlightedColor"/>
@@ -76,7 +76,7 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mpj-Sq-1Kl">
-                                                                <rect key="frame" x="60" y="238" width="200" height="33"/>
+                                                                <rect key="frame" x="87.666666666666686" y="237.99999999999997" width="200" height="33.000000000000028"/>
                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="200" id="cV7-dn-svV"/>
@@ -112,13 +112,13 @@
                                                         </constraints>
                                                     </view>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jju-EB-831">
-                                                        <rect key="frame" x="0.0" y="324.5" width="320" height="100"/>
+                                                        <rect key="frame" x="0.0" y="519.66666666666663" width="375" height="100"/>
                                                         <subviews>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="AS4-G0-aSj">
-                                                                <rect key="frame" x="20" y="0.0" width="280" height="100"/>
+                                                                <rect key="frame" x="20" y="0.0" width="335" height="100"/>
                                                                 <subviews>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ibk-1l-bfT">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="280" height="50"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="335" height="50"/>
                                                                         <color key="backgroundColor" name="ThemeRed"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="50" id="rKm-eW-nXc"/>
@@ -137,7 +137,7 @@
                                                                         </connections>
                                                                     </button>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enm-wU-bXW">
-                                                                        <rect key="frame" x="0.0" y="50" width="280" height="50"/>
+                                                                        <rect key="frame" x="0.0" y="50" width="335" height="50"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="50" id="1z2-hd-CDm"/>
                                                                         </constraints>
@@ -216,16 +216,16 @@
             <point key="canvasLocation" x="268" y="238.83058470764618"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <namedColor name="ThemeMainBackground">
-            <color red="0.097999997437000275" green="0.097999997437000275" blue="0.097999997437000275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeRed">
-            <color red="1" green="0.15299999713897705" blue="0.15299999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.92941176470588238" green="0.10588235294117647" blue="0.14117647058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeText">
-            <color white="0.80299997329711914" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
index e02845db..72138f4a 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift	
@@ -27,8 +27,8 @@ class SendMoneyCodeViewController: UIViewController {
   
   var timer: Timer?
   
-  let expiryTime = 120 // second
-  var count: Int = 120 {
+  let expiryTime = 5 // second
+  var count: Int = 5 {
     didSet {
       if ( count <= 0) {
         count = expiryTime // two minutes passed
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
index 58566bf3..5d0ee7b4 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -41,48 +41,30 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ht-uj-bS8">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="1000"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="966"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="894.5" translatesAutoresizingMaskIntoConstraints="NO" id="WYP-Q8-sI7">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="934"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="938"/>
                                         <subviews>
                                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rub-fY-JfS">
-                                                <rect key="frame" x="10" y="12" width="355" height="222"/>
+                                                <rect key="frame" x="10" y="12" width="355" height="226"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_recipient_bg" translatesAutoresizingMaskIntoConstraints="NO" id="7gs-aB-SPb">
-                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="222"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="226"/>
                                                     </imageView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b46-CG-sdO" userLabel="Label Secure">
-                                                        <rect key="frame" x="74.5" y="170.5" width="206" height="30"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="3Jn-6L-cpn"/>
-                                                        </constraints>
-                                                        <string key="text">Please keep this GME control no. very secure.
-Share with concerned party only</string>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Payout Amount: " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QkS-Yx-Lt4">
-                                                        <rect key="frame" x="108.5" y="130" width="138" height="16.5"/>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customer" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KlR-r5-hsc" userLabel="Label Recipient">
-                                                        <rect key="frame" x="147" y="101" width="61.5" height="21"/>
+                                                        <rect key="frame" x="108.5" y="117" width="138" height="17"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="21" id="s6H-N0-HrZ"/>
+                                                            <constraint firstAttribute="height" constant="17" id="Q0t-Ck-6nH"/>
                                                         </constraints>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="14"/>
+                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_gme_logo" translatesAutoresizingMaskIntoConstraints="NO" id="Oqg-r5-Yx8">
                                                         <rect key="frame" x="157.5" y="16" width="40" height="40"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="width" constant="40" id="3ZO-N5-27l"/>
-                                                            <constraint firstAttribute="height" constant="40" id="InN-Xi-T9w"/>
+                                                            <constraint firstAttribute="height" constant="40" id="gcn-z7-9Qc"/>
                                                         </constraints>
                                                     </imageView>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qsC-Fh-fNR">
@@ -94,69 +76,84 @@ Share with concerned party only</string>
                                                         <inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="10"/>
                                                     </button>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transfer Successful" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JkE-DM-feU">
-                                                        <rect key="frame" x="81.5" y="59" width="192.5" height="21"/>
+                                                        <rect key="frame" x="78.5" y="59" width="198" height="21"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="21" id="KcH-51-mbp"/>
+                                                            <constraint firstAttribute="height" constant="21" id="DkI-xS-doz"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="22"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You have successfully transferred your money to" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WOJ-Co-KyP" userLabel="Label Info">
-                                                        <rect key="frame" x="26" y="81" width="303.5" height="21"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GME Control No. " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="97m-vq-ytA" userLabel="Label Control Number">
+                                                        <rect key="frame" x="114" y="142" width="127" height="21"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="21" id="IdM-7S-Fmo"/>
+                                                            <constraint firstAttribute="height" constant="21" id="hze-ZQ-19v"/>
                                                         </constraints>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
+                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Heavy" family="San Francisco Display" pointSize="16"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_lock" translatesAutoresizingMaskIntoConstraints="NO" id="hp2-4c-2z6">
-                                                        <rect key="frame" x="65" y="176.5" width="5.5" height="6.5"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customer" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KlR-r5-hsc" userLabel="Label Recipient">
+                                                        <rect key="frame" x="147" y="84" width="61.5" height="25"/>
+                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="14"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Payment provided by Money gram" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="b46-CG-sdO" userLabel="Label Secure">
+                                                        <rect key="frame" x="82" y="169" width="232" height="20"/>
+                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="16"/>
+                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XZ4-oT-aRP">
+                                                        <rect key="frame" x="34" y="162" width="37" height="34"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="5.5" id="Ap2-od-9jq"/>
-                                                            <constraint firstAttribute="height" relation="lessThanOrEqual" constant="6.5" id="bIU-cA-LZW"/>
+                                                            <constraint firstAttribute="width" constant="37" id="7lb-Wv-YM1"/>
+                                                            <constraint firstAttribute="height" constant="34" id="zjT-w1-zTo"/>
                                                         </constraints>
                                                     </imageView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GME Control No. " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="97m-vq-ytA" userLabel="Label Control Number">
-                                                        <rect key="frame" x="114" y="143.5" width="127" height="21"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="21" id="GFH-M7-zr4"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Heavy" family="San Francisco Display" pointSize="16"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please donot share transaction reference number other than valid receipent." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XKk-Kj-0VO">
+                                                        <rect key="frame" x="10" y="196" width="335" height="30"/>
+                                                        <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="12"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                 </subviews>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
-                                                    <constraint firstItem="b46-CG-sdO" firstAttribute="leading" secondItem="hp2-4c-2z6" secondAttribute="trailing" constant="4" id="6Wc-rf-EA3"/>
-                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="ATM-U6-Ecn"/>
+                                                    <constraint firstAttribute="trailing" secondItem="b46-CG-sdO" secondAttribute="trailing" constant="41" id="27g-qv-6FL"/>
+                                                    <constraint firstItem="QkS-Yx-Lt4" firstAttribute="top" secondItem="KlR-r5-hsc" secondAttribute="bottom" constant="8" symbolic="YES" id="2d6-Ks-2Fp"/>
+                                                    <constraint firstItem="Oqg-r5-Yx8" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="top" constant="16" id="7AX-L2-ZAI"/>
+                                                    <constraint firstItem="XKk-Kj-0VO" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="10" id="DCt-NK-XPA"/>
                                                     <constraint firstAttribute="trailing" secondItem="qsC-Fh-fNR" secondAttribute="trailing" constant="16" id="FMK-nd-Cbu"/>
-                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="centerX" secondItem="7gs-aB-SPb" secondAttribute="centerX" id="Gtw-mD-CcZ"/>
-                                                    <constraint firstItem="WOJ-Co-KyP" firstAttribute="top" secondItem="JkE-DM-feU" secondAttribute="bottom" constant="1" id="Jmj-Us-bOZ"/>
-                                                    <constraint firstItem="b46-CG-sdO" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="KKn-gs-2tA"/>
-                                                    <constraint firstItem="WOJ-Co-KyP" firstAttribute="centerX" secondItem="7gs-aB-SPb" secondAttribute="centerX" id="N5m-Dy-zQ3"/>
-                                                    <constraint firstItem="QkS-Yx-Lt4" firstAttribute="top" secondItem="KlR-r5-hsc" secondAttribute="bottom" constant="8" symbolic="YES" id="SpT-AB-Ces"/>
-                                                    <constraint firstItem="Oqg-r5-Yx8" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="top" constant="16" id="SrF-go-UHK"/>
-                                                    <constraint firstItem="hp2-4c-2z6" firstAttribute="top" secondItem="97m-vq-ytA" secondAttribute="bottom" constant="12" id="VhM-R1-Af6"/>
-                                                    <constraint firstItem="97m-vq-ytA" firstAttribute="centerX" secondItem="7gs-aB-SPb" secondAttribute="centerX" id="WUN-mo-hef"/>
-                                                    <constraint firstItem="QkS-Yx-Lt4" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="a9F-4i-LYm"/>
+                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="Fsa-E3-fDY"/>
+                                                    <constraint firstItem="97m-vq-ytA" firstAttribute="top" secondItem="QkS-Yx-Lt4" secondAttribute="bottom" constant="8" symbolic="YES" id="Gp2-aY-z2D"/>
+                                                    <constraint firstItem="Oqg-r5-Yx8" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="157.5" id="MM6-7L-LlN"/>
+                                                    <constraint firstAttribute="bottom" secondItem="QkS-Yx-Lt4" secondAttribute="bottom" constant="92" id="OWA-CT-ATs"/>
+                                                    <constraint firstItem="b46-CG-sdO" firstAttribute="leading" secondItem="XZ4-oT-aRP" secondAttribute="trailing" constant="11" id="OnU-Xy-xeD"/>
+                                                    <constraint firstAttribute="bottom" secondItem="XZ4-oT-aRP" secondAttribute="bottom" constant="30" id="VRv-eX-Rn7"/>
+                                                    <constraint firstItem="97m-vq-ytA" firstAttribute="centerX" secondItem="QkS-Yx-Lt4" secondAttribute="centerX" id="bAN-0f-fvp"/>
                                                     <constraint firstAttribute="trailing" secondItem="7gs-aB-SPb" secondAttribute="trailing" id="eEn-Dx-rrF"/>
                                                     <constraint firstAttribute="bottom" secondItem="7gs-aB-SPb" secondAttribute="bottom" id="fKF-Wg-RQ4"/>
+                                                    <constraint firstAttribute="trailing" secondItem="XKk-Kj-0VO" secondAttribute="trailing" constant="10" id="icD-8g-svU"/>
+                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="78.5" id="lnl-K3-8pE"/>
+                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="top" secondItem="Oqg-r5-Yx8" secondAttribute="bottom" constant="3" id="nxp-BU-dn9"/>
+                                                    <constraint firstItem="XKk-Kj-0VO" firstAttribute="top" secondItem="b46-CG-sdO" secondAttribute="bottom" constant="7" id="pNM-NV-Jri"/>
+                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="top" secondItem="JkE-DM-feU" secondAttribute="bottom" constant="4" id="pPh-OC-iMg"/>
                                                     <constraint firstItem="7gs-aB-SPb" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" id="ps4-Wq-4Lx"/>
+                                                    <constraint firstItem="b46-CG-sdO" firstAttribute="top" secondItem="97m-vq-ytA" secondAttribute="bottom" constant="6" id="r87-On-9zu"/>
+                                                    <constraint firstItem="XZ4-oT-aRP" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="34" id="sT8-kt-14M"/>
                                                     <constraint firstItem="qsC-Fh-fNR" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="top" constant="16" id="t9k-V0-D76"/>
-                                                    <constraint firstItem="Oqg-r5-Yx8" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="vw5-je-ySM"/>
-                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="top" secondItem="WOJ-Co-KyP" secondAttribute="bottom" constant="-1" id="w0u-Yv-neN"/>
+                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="centerX" secondItem="QkS-Yx-Lt4" secondAttribute="centerX" id="uLs-9g-IWS"/>
+                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="centerX" secondItem="KlR-r5-hsc" secondAttribute="centerX" id="ug8-4a-ud9"/>
+                                                    <constraint firstAttribute="bottom" secondItem="XKk-Kj-0VO" secondAttribute="bottom" id="v8j-EX-AkV"/>
+                                                    <constraint firstItem="XKk-Kj-0VO" firstAttribute="top" secondItem="XZ4-oT-aRP" secondAttribute="bottom" id="vxj-FA-KRg"/>
                                                     <constraint firstItem="7gs-aB-SPb" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="top" id="xDR-cP-9q0"/>
-                                                    <constraint firstItem="b46-CG-sdO" firstAttribute="top" secondItem="QkS-Yx-Lt4" secondAttribute="bottom" constant="24" id="xIv-uO-PNu"/>
-                                                    <constraint firstItem="b46-CG-sdO" firstAttribute="top" secondItem="97m-vq-ytA" secondAttribute="bottom" constant="6" id="xMc-ZG-6Py"/>
-                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="top" secondItem="Oqg-r5-Yx8" secondAttribute="bottom" constant="3.1000000000000001" id="z4B-TZ-d5N"/>
-                                                    <constraint firstAttribute="height" constant="222" id="z7w-5x-v3N"/>
+                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="222" id="z7w-5x-v3N"/>
                                                 </constraints>
                                             </view>
                                             <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKI-eb-ZTN" customClass="ShadowView" customModule="GME_Remit" customModuleProvider="target">
-                                                <rect key="frame" x="10" y="244" width="355" height="600"/>
+                                                <rect key="frame" x="10" y="248" width="355" height="600"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="N4e-L0-lEA">
                                                         <rect key="frame" x="0.0" y="0.0" width="355" height="600"/>
@@ -168,13 +165,13 @@ Share with concerned party only</string>
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transaction Date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0F1-wm-gWq" userLabel="Relation">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="106" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="106.5" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Qz4-OT-jiF">
-                                                                                <rect key="frame" x="106" y="0.0" width="223" height="50"/>
+                                                                                <rect key="frame" x="106.5" y="0.0" width="222.5" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -377,13 +374,13 @@ Share with concerned party only</string>
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account Number" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AIR-Co-29n" userLabel="Agent">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="106.5" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="107" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Mle-zI-ZDV">
-                                                                                <rect key="frame" x="108.5" y="0.0" width="220.5" height="50"/>
+                                                                                <rect key="frame" x="109" y="0.0" width="220" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -536,7 +533,7 @@ Share with concerned party only</string>
                                                 </userDefinedRuntimeAttributes>
                                             </view>
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="PMG-MW-2Jh">
-                                                <rect key="frame" x="10" y="864" width="355" height="40"/>
+                                                <rect key="frame" x="10" y="868" width="355" height="40"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CVW-u5-4q0">
                                                         <rect key="frame" x="0.0" y="0.0" width="172.5" height="40"/>
@@ -577,7 +574,7 @@ Share with concerned party only</string>
                                                 </constraints>
                                             </stackView>
                                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vlt-YJ-pwY">
-                                                <rect key="frame" x="10" y="864" width="355" height="50"/>
+                                                <rect key="frame" x="10" y="868" width="355" 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="ROj-N3-WAp"/>
@@ -646,7 +643,6 @@ Share with concerned party only</string>
                         <outlet property="branchLabel" destination="gWt-Rx-LIV" id="vYW-fW-Zia"/>
                         <outlet property="branchTitleLabel" destination="tPz-r0-qXQ" id="EcH-Cb-x3N"/>
                         <outlet property="branchView" destination="FWa-U9-qgm" id="wGU-O8-UrG"/>
-                        <outlet property="concernedPartyText" destination="b46-CG-sdO" id="Aw7-jR-NBH"/>
                         <outlet property="doneButton" destination="vlt-YJ-pwY" id="lW3-BS-VYD"/>
                         <outlet property="exRateTitleLabel" destination="pTI-kV-y2i" id="bSY-2B-msg"/>
                         <outlet property="exchangeRateContainerView" destination="Hzj-s4-Pz9" id="mMt-Nq-NM1"/>
@@ -656,6 +652,8 @@ Share with concerned party only</string>
                         <outlet property="mobileContainerView" destination="W4g-Xv-Fmk" id="ZFd-uB-7eQ"/>
                         <outlet property="mobileNoLabel" destination="SJg-la-JAc" id="XIo-nM-Lye"/>
                         <outlet property="mobileTitleLabel" destination="bTl-Ab-V1o" id="F8f-mH-7Gt"/>
+                        <outlet property="moneygramImageView" destination="XZ4-oT-aRP" id="zeh-8H-F6N"/>
+                        <outlet property="moneygramLogoLabel" destination="b46-CG-sdO" id="ukR-HY-dMv"/>
                         <outlet property="payoutAgentTitleLabel" destination="1bL-P8-CBf" id="pd0-AV-HGh"/>
                         <outlet property="receiverNameContainerView" destination="P8E-dB-3bF" id="GKQ-Sd-APs"/>
                         <outlet property="recieverNameLabelLabel" destination="dxd-Uq-v7o" id="eGF-Lp-3mc"/>
@@ -666,7 +664,6 @@ Share with concerned party only</string>
                         <outlet property="sentAmountTitleLabel" destination="aV9-MU-U9F" id="lIj-ar-a2b"/>
                         <outlet property="serviceFeeContainerView" destination="I1w-qc-GAw" id="dMU-JL-oP8"/>
                         <outlet property="serviceTitleLabel" destination="52t-h8-txs" id="pxx-Vh-hcw"/>
-                        <outlet property="successMessageTitleLabel" destination="WOJ-Co-KyP" id="OYX-Pu-kz2"/>
                         <outlet property="tansactionDateTitleLabel" destination="0F1-wm-gWq" id="Ehr-9W-dU3"/>
                         <outlet property="totalAmountHeaderLabel" destination="QkS-Yx-Lt4" id="hdr-dQ-EoL"/>
                         <outlet property="totalAmountLabel" destination="63I-2O-WVX" id="hpc-ve-FfO"/>
@@ -681,27 +678,27 @@ Share with concerned party only</string>
                         <outlet property="usedCouponContainerView" destination="2P3-eK-NLt" id="Ep0-ZH-7Ye"/>
                         <outlet property="usedCouponLabel" destination="PP3-Tg-vui" id="U6N-oQ-9Wc"/>
                         <outlet property="usedCouponTitleLabel" destination="ncx-dc-Qlg" id="Qc4-PE-JvX"/>
+                        <outlet property="warningLabel" destination="XKk-Kj-0VO" id="2cY-fn-oNM"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="b3B-PU-UlH" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <tapGestureRecognizer id="Nbz-kB-4Hj"/>
             </objects>
-            <point key="canvasLocation" x="-842.39999999999998" y="345.42728635682164"/>
+            <point key="canvasLocation" x="-842.75362318840587" y="344.86607142857139"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="ic_gme_logo" width="40" height="40"/>
-        <image name="ic_lock" width="6" height="7"/>
         <image name="ic_recipient_bg" width="355" height="226"/>
         <namedColor name="ThemeMainBackground">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeRed">
-            <color red="0.92900002002716064" green="0.10599999874830246" blue="0.14100000262260437" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.92941176470588238" green="0.10588235294117647" blue="0.14117647058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeText">
             <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
index 2095f989..aef717ed 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift	
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 enum MailBoxType {
   case cancel
@@ -24,8 +25,6 @@ class SendMoneyReceiptViewController: UIViewController {
   
   struct StringConstants {
     let transferSuccessText = "transfer_success_text".localized()
-    let successfullyTransferredText = "transfer_success_info_text".localized()
-    let concernedPartyText = "transfer_success_info_text".localized()
     let transactionDateText = "transaction_date_text".localized()
     let recieverText = "receiver_text".localized()
     let addressText = "email_address_text".localized()
@@ -67,9 +66,11 @@ class SendMoneyReceiptViewController: UIViewController {
   
   // title labels
   @IBOutlet weak var transferSuccessfullTitleLabel: UILabel!
-  @IBOutlet weak var successMessageTitleLabel: UILabel!
-  @IBOutlet weak var concernedPartyText: UILabel!
+  @IBOutlet weak var moneygramImageView: UIImageView!
+  @IBOutlet weak var moneygramLogoLabel: UILabel!
+  @IBOutlet weak var warningLabel: UILabel!
   
+  // Body labels
   @IBOutlet weak var tansactionDateTitleLabel: UILabel!
   @IBOutlet weak var recieverTitleLabel: UILabel!
   @IBOutlet weak var addressTitleLabel: UILabel!
@@ -207,8 +208,6 @@ class SendMoneyReceiptViewController: UIViewController {
   
   func configureLanguage() {
     self.transferSuccessfullTitleLabel.text = StringConstants().transferSuccessText
-    self.successMessageTitleLabel.text = StringConstants().successfullyTransferredText
-    self.concernedPartyText.text = StringConstants().concernedPartyText
     self.tansactionDateTitleLabel.text = StringConstants().transactionDateText
     self.recieverTitleLabel.text = StringConstants().recieverText
     self.addressTitleLabel.text = StringConstants().addressText
@@ -267,7 +266,7 @@ class SendMoneyReceiptViewController: UIViewController {
     let fullName = firstName + " " + middleName + " " + lastName
     
     self.recieverNameLabelLabel.text = fullName.uppercased()
-    self.fullnameLabel.text = fullName.uppercased()
+    self.fullnameLabel.text = "To \(fullName.uppercased())"
     
     self.transactionDateLabel.text = reciept?.transactionDate
     
@@ -292,8 +291,21 @@ class SendMoneyReceiptViewController: UIViewController {
     
     self.totalAmountLabel.text = totalAmount
     self.totalAmountHeaderLabel.text =  StringConstants().totalPayoutAmountText +  ": \(totalAmount)"
-        
+    
     usedCouponLabel.text = reciept?.formattedCouponName
+    
+    if reciept?.showPartnerLogo == "Y" {
+      
+      if let imageData = reciept?.logoUrl,
+        let url = URL(string: imageData) {
+        moneygramImageView.kf.setImage(with: url)
+      }
+      moneygramLogoLabel.text = reciept?.logoText
+    } else {
+      moneygramImageView.isHidden = true
+      moneygramLogoLabel.isHidden = true
+    }
+    warningLabel.text = reciept?.note
   }
 }
 
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard
index 12afb9c3..040ed04f 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -38,11 +38,11 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="179"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="z2K-Ca-fNc">
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="z2K-Ca-fNc">
                                                     <rect key="frame" x="20" y="20" width="335" height="143.5"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reciever Details" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t6R-up-3D6">
-                                                            <rect key="frame" x="0.0" y="0.0" width="335" height="3.5"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="335" height="8.5"/>
                                                             <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
                                                             <color key="textColor" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
@@ -233,7 +233,7 @@
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="unK-ZK-hwr">
                                                             <rect key="frame" x="0.0" y="30" width="335" height="244.5"/>
                                                             <subviews>
-                                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="XUh-zT-I3S">
+                                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="XUh-zT-I3S">
                                                                     <rect key="frame" x="5" y="0.0" width="330" height="244.5"/>
                                                                     <subviews>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="gXi-M0-QGx">
@@ -269,7 +269,7 @@
                                                                             </constraints>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="NcR-bm-5Qa">
-                                                                            <rect key="frame" x="0.0" y="35" width="330" height="25"/>
+                                                                            <rect key="frame" x="0.0" y="33" width="330" height="25"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8fT-8K-UU0">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="330" height="25"/>
@@ -298,7 +298,7 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="c7W-ci-3o9">
-                                                                            <rect key="frame" x="0.0" y="70" width="330" height="25"/>
+                                                                            <rect key="frame" x="0.0" y="66" width="330" height="25"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ion-vp-h63">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="330" height="25"/>
@@ -327,7 +327,7 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="bYP-z7-pdo">
-                                                                            <rect key="frame" x="0.0" y="105" width="330" height="25"/>
+                                                                            <rect key="frame" x="0.0" y="99" width="330" height="25"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gi5-r4-dyO">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="330" height="25"/>
@@ -356,7 +356,7 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="IRO-hu-J2s">
-                                                                            <rect key="frame" x="0.0" y="140" width="330" height="25"/>
+                                                                            <rect key="frame" x="0.0" y="131.5" width="330" height="25"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cT0-TW-JtH">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="330" height="25"/>
@@ -383,13 +383,13 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="rk2-Ky-8dn">
-                                                                            <rect key="frame" x="0.0" y="175" width="330" height="34.5"/>
+                                                                            <rect key="frame" x="0.0" y="164.5" width="330" height="47"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eR3-EP-Bkf">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="330" height="34.5"/>
+                                                                                    <rect key="frame" x="0.0" y="0.0" width="330" height="47"/>
                                                                                     <subviews>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Payout Agent/Bank" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="vzF-GP-Vyz">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="120" height="34.5"/>
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="120" height="47"/>
                                                                                             <constraints>
                                                                                                 <constraint firstAttribute="width" constant="120" id="djk-ZF-0dD"/>
                                                                                             </constraints>
@@ -398,7 +398,7 @@
                                                                                             <nil key="highlightedColor"/>
                                                                                         </label>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="aaslkdfjalskdjfalksdjfalksdjfalksdjflkasdjflaksdjflaksdjflaksdjflaksdjflaksdjflkasdjfalksdjfalksdjf" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="VpB-U7-5VE">
-                                                                                            <rect key="frame" x="120" y="0.0" width="210" height="34.5"/>
+                                                                                            <rect key="frame" x="120" y="0.0" width="210" height="47"/>
                                                                                             <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="13"/>
                                                                                             <color key="textColor" name="ThemeText"/>
                                                                                             <nil key="highlightedColor"/>
@@ -493,11 +493,11 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="180"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="QPQ-CD-dbK">
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="QPQ-CD-dbK">
                                                     <rect key="frame" x="96.5" y="15" width="182" height="56"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I have read and agreed to " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yn5-1J-nDc">
-                                                            <rect key="frame" x="15" y="0.0" width="152.5" height="16"/>
+                                                            <rect key="frame" x="20" y="0.0" width="142.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="16" id="JdA-Lq-CBJ"/>
                                                             </constraints>
@@ -506,18 +506,28 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jdB-M7-bxd">
-                                                            <rect key="frame" x="0.0" y="16" width="182" height="40"/>
+                                                            <rect key="frame" x="0.0" y="19" width="182" height="20"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="40" id="0Vz-S9-ULW"/>
+                                                                <constraint firstAttribute="height" constant="20" id="0Vz-S9-ULW"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="12"/>
-                                                            <state key="normal" title="GME Remittance User Agreement">
+                                                            <state key="normal" title="1.GME Remittance User Agreement">
                                                                 <color key="titleColor" name="ThemeRed"/>
                                                             </state>
                                                             <connections>
                                                                 <action selector="showUserAgreement:" destination="z1L-xE-OXS" eventType="touchUpInside" id="AMV-wa-4zm"/>
                                                             </connections>
                                                         </button>
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1BJ-uU-LNZ">
+                                                            <rect key="frame" x="2" y="42" width="178" height="14"/>
+                                                            <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="12"/>
+                                                            <state key="normal" title="2. GME Remittance Fraud Warning">
+                                                                <color key="titleColor" name="ThemeRed"/>
+                                                            </state>
+                                                            <connections>
+                                                                <action selector="showUserAgreement:" destination="z1L-xE-OXS" eventType="touchUpInside" id="90p-xQ-WBt"/>
+                                                            </connections>
+                                                        </button>
                                                     </subviews>
                                                 </stackView>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xqI-8I-x6g">
@@ -591,6 +601,7 @@
             <point key="canvasLocation" x="23.199999999999999" y="227.13643178410797"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <namedColor name="ThemeMainBackground">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -602,5 +613,4 @@
             <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroup.storyboard b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroup.storyboard
index 5ee4208f..c2673dfe 100644
--- a/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroup.storyboard	
+++ b/GME Remit/Modules/RewardModules/RewardGroup/User Interface/View/RewardGroup.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="GtC-iQ-Pz8">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="GtC-iQ-Pz8">
     <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -84,6 +84,7 @@
             <point key="canvasLocation" x="-92" y="232.53373313343329"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="ic_cancel" width="12" height="12"/>
         <namedColor name="ThemeBlack">
@@ -93,5 +94,4 @@
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Utilities/CustomUI/GMEAlert/GMEAlertViewController.xib b/GME Remit/Utilities/CustomUI/GMEAlert/GMEAlertViewController.xib
index 5224e33c..73078dbf 100644
--- a/GME Remit/Utilities/CustomUI/GMEAlert/GMEAlertViewController.xib	
+++ b/GME Remit/Utilities/CustomUI/GMEAlert/GMEAlertViewController.xib	
@@ -3,7 +3,7 @@
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

From 77d6c1db0ad953ba06c1dde0a4a828914e6f8288 Mon Sep 17 00:00:00 2001
From: Jeongbae Kong <jubakong1@gmail.com>
Date: Wed, 22 Apr 2020 13:43:29 +0900
Subject: [PATCH 2/2] MoneyGram, fraud warning UI optimized

---
 .../NotificationHistoryPresenter.swift        |  17 +-
 .../View/NotificationHistory.storyboard       |   6 +-
 .../User Interface/View/Recipients.storyboard |  10 +-
 .../View/SendMoneyReceipt.storyboard          | 173 ++++++++++--------
 .../View/SendMoneyReceiptViewController.swift |   7 +-
 .../View/SendMoneyVerification.storyboard     |  22 +--
 .../View/TransactionHistory.storyboard        |   6 +-
 .../User Interface/View/Reward.storyboard     |  30 +--
 8 files changed, 149 insertions(+), 122 deletions(-)

diff --git a/GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift b/GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift
index 36100865..02dc78cc 100644
--- a/GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift	
+++ b/GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift	
@@ -58,8 +58,23 @@ class NotificationHistoryPresenter: ViewModelType {
 extension NotificationHistoryPresenter: NotificationHistoryInteractorOutput {
   func setNotices(with model: [NoticeModel]) {
     progressLinker.onNext(false)
+    let dateFormatter = DateFormatter()
+    dateFormatter.dateFormat = "MM/dd/yyyy HH:mm"
+    
+    let dates = model.compactMap { dateFormatter.date(from: $0.date ?? "") }
+
+    let sortedDates = dates.sorted { $0 > $1 }
+
+    print("123123123 \(sortedDates)")
+
+    let dateStrings = sortedDates.compactMap { dateFormatter.string(from: $0)}
+
+    print("123123123 \(dateStrings)")
+    
     let filteredDate = model.sorted(by: { (noticeModel1, noticeModel2) -> Bool in
-      return noticeModel1.date ?? "" > noticeModel2.date ?? ""
+      guard let date1 = noticeModel1.date else { return true }
+      guard let date2 = noticeModel2.date else { return false }
+      return date1 > date2
     })
     
     self.model.onNext(filteredDate)
diff --git a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard
index 5c2df429..5d927da9 100644
--- a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard	
+++ b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="kME-hR-NgN">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="kME-hR-NgN">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -161,6 +161,7 @@
             <point key="canvasLocation" x="-92" y="232.53373313343329"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="ic_cancel" width="12" height="12"/>
         <image name="new" width="17" height="5"/>
@@ -175,5 +176,4 @@
             <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
index b1e81fe8..1c5e89a5 100644
--- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard	
+++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -29,7 +29,7 @@
                                 <rect key="frame" x="20" y="10" width="335" height="80"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_recipient" translatesAutoresizingMaskIntoConstraints="NO" id="JqD-KC-CpN">
-                                        <rect key="frame" x="20" y="7.5" width="65" height="65"/>
+                                        <rect key="frame" x="20" y="15" width="50" height="50"/>
                                         <color key="backgroundColor" name="ThemeMainBackground"/>
                                         <constraints>
                                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="AET-jx-i1P"/>
@@ -38,7 +38,7 @@
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Recipient" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Wj9-qf-u2U">
-                                        <rect key="frame" x="105" y="30" width="213" height="20"/>
+                                        <rect key="frame" x="90" y="30" width="228" height="20"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
                                         <color key="textColor" name="ThemeText"/>
                                         <nil key="highlightedColor"/>
@@ -289,6 +289,7 @@
             <point key="canvasLocation" x="736.79999999999995" y="223.53823088455775"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="flag_south_korea" width="512" height="512"/>
         <image name="ic-sendmoney" width="20.5" height="20.5"/>
@@ -308,5 +309,4 @@
             <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
index 5d0ee7b4..3933d31e 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
@@ -41,28 +41,28 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ht-uj-bS8">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="966"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="1000"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="894.5" translatesAutoresizingMaskIntoConstraints="NO" id="WYP-Q8-sI7">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="938"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="982"/>
                                         <subviews>
                                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rub-fY-JfS">
-                                                <rect key="frame" x="10" y="12" width="355" height="226"/>
+                                                <rect key="frame" x="10" y="12" width="355" height="270"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_recipient_bg" translatesAutoresizingMaskIntoConstraints="NO" id="7gs-aB-SPb">
-                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="226"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="270"/>
                                                     </imageView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Payout Amount: " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QkS-Yx-Lt4">
-                                                        <rect key="frame" x="108.5" y="117" width="138" height="17"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Payout Amount: " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="QkS-Yx-Lt4">
+                                                        <rect key="frame" x="113.00000000000001" y="117" width="129.33333333333337" height="21"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="17" id="Q0t-Ck-6nH"/>
+                                                            <constraint firstAttribute="height" constant="21" id="chX-N9-jBl"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_gme_logo" translatesAutoresizingMaskIntoConstraints="NO" id="Oqg-r5-Yx8">
-                                                        <rect key="frame" x="157.5" y="16" width="40" height="40"/>
+                                                        <rect key="frame" x="157.66666666666666" y="16" width="40" height="40"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="40" id="gcn-z7-9Qc"/>
                                                         </constraints>
@@ -75,8 +75,8 @@
                                                         </constraints>
                                                         <inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="10"/>
                                                     </button>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transfer Successful" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JkE-DM-feU">
-                                                        <rect key="frame" x="78.5" y="59" width="198" height="21"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transfer Successful" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="JkE-DM-feU">
+                                                        <rect key="frame" x="78.333333333333329" y="59" width="198.66666666666669" height="21"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="21" id="DkI-xS-doz"/>
                                                         </constraints>
@@ -84,76 +84,85 @@
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GME Control No. " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="97m-vq-ytA" userLabel="Label Control Number">
-                                                        <rect key="frame" x="114" y="142" width="127" height="21"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GME Control No. " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="97m-vq-ytA" userLabel="Label Control Number">
+                                                        <rect key="frame" x="116.66666666666669" y="146" width="122" height="21"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="21" id="hze-ZQ-19v"/>
+                                                            <constraint firstAttribute="height" constant="21" id="B3T-rc-sl1"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Heavy" family="San Francisco Display" pointSize="16"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customer" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KlR-r5-hsc" userLabel="Label Recipient">
-                                                        <rect key="frame" x="147" y="84" width="61.5" height="25"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Customer" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="KlR-r5-hsc" userLabel="Label Recipient">
+                                                        <rect key="frame" x="116.66666666666669" y="84" width="122" height="21"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="21" id="h32-zP-aoR"/>
+                                                        </constraints>
                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="14"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Payment provided by Money gram" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="b46-CG-sdO" userLabel="Label Secure">
-                                                        <rect key="frame" x="82" y="169" width="232" height="20"/>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="16"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="XZ4-oT-aRP">
-                                                        <rect key="frame" x="34" y="162" width="37" height="34"/>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="DpT-EG-MKU">
+                                                        <rect key="frame" x="20" y="172" width="315" height="93"/>
+                                                        <subviews>
+                                                            <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="3rx-1J-TMa">
+                                                                <rect key="frame" x="0.0" y="0.0" width="275.66666666666669" height="36"/>
+                                                                <subviews>
+                                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="angryFaceLarge" translatesAutoresizingMaskIntoConstraints="NO" id="XZ4-oT-aRP">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="36" height="36"/>
+                                                                    </imageView>
+                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Payment provided by MoneyGram" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="b46-CG-sdO" userLabel="Label Secure">
+                                                                        <rect key="frame" x="45.999999999999986" y="0.0" width="229.66666666666663" height="36"/>
+                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="16"/>
+                                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        <nil key="highlightedColor"/>
+                                                                    </label>
+                                                                </subviews>
+                                                            </stackView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please donot share transaction reference number other than valid receipent." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="6" translatesAutoresizingMaskIntoConstraints="NO" id="XKk-Kj-0VO">
+                                                                <rect key="frame" x="0.0" y="37" width="315" height="56"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="56" id="tBh-TA-Wkr"/>
+                                                                </constraints>
+                                                                <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="12"/>
+                                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                        </subviews>
                                                         <constraints>
-                                                            <constraint firstAttribute="width" constant="37" id="7lb-Wv-YM1"/>
-                                                            <constraint firstAttribute="height" constant="34" id="zjT-w1-zTo"/>
+                                                            <constraint firstAttribute="trailing" secondItem="XKk-Kj-0VO" secondAttribute="trailing" id="Pbe-iy-LpV"/>
+                                                            <constraint firstItem="XKk-Kj-0VO" firstAttribute="leading" secondItem="DpT-EG-MKU" secondAttribute="leading" id="aKY-We-js5"/>
                                                         </constraints>
-                                                    </imageView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please donot share transaction reference number other than valid receipent." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XKk-Kj-0VO">
-                                                        <rect key="frame" x="10" y="196" width="335" height="30"/>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="12"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
+                                                    </stackView>
                                                 </subviews>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="trailing" secondItem="b46-CG-sdO" secondAttribute="trailing" constant="41" id="27g-qv-6FL"/>
-                                                    <constraint firstItem="QkS-Yx-Lt4" firstAttribute="top" secondItem="KlR-r5-hsc" secondAttribute="bottom" constant="8" symbolic="YES" id="2d6-Ks-2Fp"/>
                                                     <constraint firstItem="Oqg-r5-Yx8" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="top" constant="16" id="7AX-L2-ZAI"/>
-                                                    <constraint firstItem="XKk-Kj-0VO" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="10" id="DCt-NK-XPA"/>
+                                                    <constraint firstAttribute="trailing" secondItem="DpT-EG-MKU" secondAttribute="trailing" constant="20" id="8yi-fc-6vt"/>
                                                     <constraint firstAttribute="trailing" secondItem="qsC-Fh-fNR" secondAttribute="trailing" constant="16" id="FMK-nd-Cbu"/>
                                                     <constraint firstItem="JkE-DM-feU" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="Fsa-E3-fDY"/>
-                                                    <constraint firstItem="97m-vq-ytA" firstAttribute="top" secondItem="QkS-Yx-Lt4" secondAttribute="bottom" constant="8" symbolic="YES" id="Gp2-aY-z2D"/>
-                                                    <constraint firstItem="Oqg-r5-Yx8" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="157.5" id="MM6-7L-LlN"/>
-                                                    <constraint firstAttribute="bottom" secondItem="QkS-Yx-Lt4" secondAttribute="bottom" constant="92" id="OWA-CT-ATs"/>
-                                                    <constraint firstItem="b46-CG-sdO" firstAttribute="leading" secondItem="XZ4-oT-aRP" secondAttribute="trailing" constant="11" id="OnU-Xy-xeD"/>
-                                                    <constraint firstAttribute="bottom" secondItem="XZ4-oT-aRP" secondAttribute="bottom" constant="30" id="VRv-eX-Rn7"/>
-                                                    <constraint firstItem="97m-vq-ytA" firstAttribute="centerX" secondItem="QkS-Yx-Lt4" secondAttribute="centerX" id="bAN-0f-fvp"/>
+                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="trailing" secondItem="97m-vq-ytA" secondAttribute="trailing" id="FuF-af-GFP"/>
+                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="leading" secondItem="97m-vq-ytA" secondAttribute="leading" id="GqB-g5-dZ4"/>
+                                                    <constraint firstItem="QkS-Yx-Lt4" firstAttribute="top" secondItem="KlR-r5-hsc" secondAttribute="bottom" constant="12" id="OEv-le-3Xu"/>
+                                                    <constraint firstItem="DpT-EG-MKU" firstAttribute="top" secondItem="97m-vq-ytA" secondAttribute="bottom" constant="5" id="P8b-By-u5U"/>
+                                                    <constraint firstItem="97m-vq-ytA" firstAttribute="top" secondItem="QkS-Yx-Lt4" secondAttribute="bottom" constant="8" id="WPI-ju-0vp"/>
+                                                    <constraint firstItem="DpT-EG-MKU" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="20" id="XaF-6U-c6E"/>
+                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="top" secondItem="JkE-DM-feU" secondAttribute="bottom" constant="4" id="aYw-2N-UDq"/>
+                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="centerX" secondItem="QkS-Yx-Lt4" secondAttribute="centerX" id="bbZ-77-F6K"/>
+                                                    <constraint firstItem="Oqg-r5-Yx8" firstAttribute="centerX" secondItem="JkE-DM-feU" secondAttribute="centerX" id="e98-Ua-9zb"/>
                                                     <constraint firstAttribute="trailing" secondItem="7gs-aB-SPb" secondAttribute="trailing" id="eEn-Dx-rrF"/>
                                                     <constraint firstAttribute="bottom" secondItem="7gs-aB-SPb" secondAttribute="bottom" id="fKF-Wg-RQ4"/>
-                                                    <constraint firstAttribute="trailing" secondItem="XKk-Kj-0VO" secondAttribute="trailing" constant="10" id="icD-8g-svU"/>
-                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="78.5" id="lnl-K3-8pE"/>
+                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="centerX" secondItem="JkE-DM-feU" secondAttribute="centerX" id="i0l-m1-TOw"/>
                                                     <constraint firstItem="JkE-DM-feU" firstAttribute="top" secondItem="Oqg-r5-Yx8" secondAttribute="bottom" constant="3" id="nxp-BU-dn9"/>
-                                                    <constraint firstItem="XKk-Kj-0VO" firstAttribute="top" secondItem="b46-CG-sdO" secondAttribute="bottom" constant="7" id="pNM-NV-Jri"/>
-                                                    <constraint firstItem="KlR-r5-hsc" firstAttribute="top" secondItem="JkE-DM-feU" secondAttribute="bottom" constant="4" id="pPh-OC-iMg"/>
                                                     <constraint firstItem="7gs-aB-SPb" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" id="ps4-Wq-4Lx"/>
-                                                    <constraint firstItem="b46-CG-sdO" firstAttribute="top" secondItem="97m-vq-ytA" secondAttribute="bottom" constant="6" id="r87-On-9zu"/>
-                                                    <constraint firstItem="XZ4-oT-aRP" firstAttribute="leading" secondItem="rub-fY-JfS" secondAttribute="leading" constant="34" id="sT8-kt-14M"/>
                                                     <constraint firstItem="qsC-Fh-fNR" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="top" constant="16" id="t9k-V0-D76"/>
-                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="centerX" secondItem="QkS-Yx-Lt4" secondAttribute="centerX" id="uLs-9g-IWS"/>
-                                                    <constraint firstItem="JkE-DM-feU" firstAttribute="centerX" secondItem="KlR-r5-hsc" secondAttribute="centerX" id="ug8-4a-ud9"/>
-                                                    <constraint firstAttribute="bottom" secondItem="XKk-Kj-0VO" secondAttribute="bottom" id="v8j-EX-AkV"/>
-                                                    <constraint firstItem="XKk-Kj-0VO" firstAttribute="top" secondItem="XZ4-oT-aRP" secondAttribute="bottom" id="vxj-FA-KRg"/>
+                                                    <constraint firstAttribute="bottom" secondItem="DpT-EG-MKU" secondAttribute="bottom" constant="5" id="w7d-46-jbY"/>
                                                     <constraint firstItem="7gs-aB-SPb" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="top" id="xDR-cP-9q0"/>
-                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="222" id="z7w-5x-v3N"/>
+                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="270" id="z7w-5x-v3N"/>
                                                 </constraints>
                                             </view>
                                             <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKI-eb-ZTN" customClass="ShadowView" customModule="GME_Remit" customModuleProvider="target">
-                                                <rect key="frame" x="10" y="248" width="355" height="600"/>
+                                                <rect key="frame" x="10" y="292" width="355" height="600"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="N4e-L0-lEA">
                                                         <rect key="frame" x="0.0" y="0.0" width="355" height="600"/>
@@ -165,13 +174,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transaction Date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0F1-wm-gWq" userLabel="Relation">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="106.5" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="108.33333333333333" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Qz4-OT-jiF">
-                                                                                <rect key="frame" x="106.5" y="0.0" width="222.5" height="50"/>
+                                                                                <rect key="frame" x="108.33333333333336" y="0.0" width="220.66666666666663" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -194,13 +203,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="253" verticalHuggingPriority="251" text="Receiver" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hpj-CZ-7qv" userLabel="Email">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="54.5" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="55.333333333333336" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="dxd-Uq-v7o">
-                                                                                <rect key="frame" x="56.5" y="0.0" width="272.5" height="50"/>
+                                                                                <rect key="frame" x="57.333333333333343" y="0.0" width="271.66666666666663" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -253,13 +262,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mobile No." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bTl-Ab-V1o" userLabel="Mobile">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="68.5" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="67.333333333333329" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="SJg-la-JAc">
-                                                                                <rect key="frame" x="70.5" y="0.0" width="258.5" height="50"/>
+                                                                                <rect key="frame" x="69.333333333333343" y="0.0" width="259.66666666666663" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -285,13 +294,13 @@
                                                                                 <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                                 <subviews>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="900" text="Payout Agent/Bank" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bL-P8-CBf" userLabel="Agent">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="163.5" height="50"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="163.66666666666666" height="50"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                         <color key="textColor" name="ThemeText"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfg" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="98o-ui-Lmx">
-                                                                                        <rect key="frame" x="165.5" y="0.0" width="163.5" height="50"/>
+                                                                                        <rect key="frame" x="165.66666666666663" y="0.0" width="163.33333333333337" height="50"/>
                                                                                         <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                         <color key="textColor" name="ThemeText"/>
                                                                                         <nil key="highlightedColor"/>
@@ -316,13 +325,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Total Sent Amount" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aV9-MU-U9F" userLabel="Relation">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="115.5" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="117" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="joO-Vx-01A">
-                                                                                <rect key="frame" x="117.5" y="0.0" width="211.5" height="50"/>
+                                                                                <rect key="frame" x="119" y="0.0" width="210" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -345,13 +354,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="900" text="Branch" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tPz-r0-qXQ" userLabel="Agent">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="45" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="45.666666666666664" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="gWt-Rx-LIV">
-                                                                                <rect key="frame" x="47" y="0.0" width="282" height="50"/>
+                                                                                <rect key="frame" x="47.666666666666657" y="0.0" width="281.33333333333337" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -374,13 +383,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account Number" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AIR-Co-29n" userLabel="Agent">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="107" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="107.33333333333333" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Mle-zI-ZDV">
-                                                                                <rect key="frame" x="109" y="0.0" width="220" height="50"/>
+                                                                                <rect key="frame" x="109.33333333333336" y="0.0" width="219.66666666666663" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -403,13 +412,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Service Fee" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="52t-h8-txs" userLabel="Agent">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="73.5" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="73" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="5Mm-Rr-tjC">
-                                                                                <rect key="frame" x="75.5" y="0.0" width="253.5" height="50"/>
+                                                                                <rect key="frame" x="75" y="0.0" width="254" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -432,13 +441,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Used Coupon" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ncx-dc-Qlg" userLabel="Agent">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="157" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="149.33333333333334" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="birthday(-20%)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="PP3-Tg-vui">
-                                                                                <rect key="frame" x="159" y="0.0" width="170" height="50"/>
+                                                                                <rect key="frame" x="151.33333333333337" y="0.0" width="177.66666666666663" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -461,13 +470,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ex Rate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pTI-kV-y2i" userLabel="Reciever">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="49" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="47.333333333333336" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="E9N-rz-5eO">
-                                                                                <rect key="frame" x="51" y="0.0" width="278" height="50"/>
+                                                                                <rect key="frame" x="49.333333333333343" y="0.0" width="279.66666666666663" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -490,13 +499,13 @@
                                                                         <rect key="frame" x="13" y="0.0" width="329" height="50"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Total Payout Amount" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rr9-dg-u1G" userLabel="Agent">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="130.5" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="132" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="63I-2O-WVX">
-                                                                                <rect key="frame" x="132.5" y="0.0" width="196.5" height="50"/>
+                                                                                <rect key="frame" x="134" y="0.0" width="195" height="50"/>
                                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
                                                                                 <color key="textColor" name="ThemeText"/>
                                                                                 <nil key="highlightedColor"/>
@@ -533,10 +542,10 @@
                                                 </userDefinedRuntimeAttributes>
                                             </view>
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="PMG-MW-2Jh">
-                                                <rect key="frame" x="10" y="868" width="355" height="40"/>
+                                                <rect key="frame" x="10" y="912" width="355" height="40"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CVW-u5-4q0">
-                                                        <rect key="frame" x="0.0" y="0.0" width="172.5" height="40"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="172.66666666666666" height="40"/>
                                                         <color key="backgroundColor" name="ThemeRed"/>
                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="14"/>
                                                         <state key="normal" title="Request to Cancel">
@@ -552,7 +561,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="APG-WQ-vh6">
-                                                        <rect key="frame" x="182.5" y="0.0" width="172.5" height="40"/>
+                                                        <rect key="frame" x="182.66666666666663" y="0.0" width="172.33333333333337" height="40"/>
                                                         <color key="backgroundColor" name="ThemeRed"/>
                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="13"/>
                                                         <state key="normal" title="Request to change">
@@ -574,7 +583,7 @@
                                                 </constraints>
                                             </stackView>
                                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vlt-YJ-pwY">
-                                                <rect key="frame" x="10" y="868" width="355" height="50"/>
+                                                <rect key="frame" x="10" y="912" width="355" 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="ROj-N3-WAp"/>
@@ -654,6 +663,7 @@
                         <outlet property="mobileTitleLabel" destination="bTl-Ab-V1o" id="F8f-mH-7Gt"/>
                         <outlet property="moneygramImageView" destination="XZ4-oT-aRP" id="zeh-8H-F6N"/>
                         <outlet property="moneygramLogoLabel" destination="b46-CG-sdO" id="ukR-HY-dMv"/>
+                        <outlet property="moneygramStackView" destination="3rx-1J-TMa" id="47D-wT-bbm"/>
                         <outlet property="payoutAgentTitleLabel" destination="1bL-P8-CBf" id="pd0-AV-HGh"/>
                         <outlet property="receiverNameContainerView" destination="P8E-dB-3bF" id="GKQ-Sd-APs"/>
                         <outlet property="recieverNameLabelLabel" destination="dxd-Uq-v7o" id="eGF-Lp-3mc"/>
@@ -684,11 +694,12 @@
                 <placeholder placeholderIdentifier="IBFirstResponder" id="b3B-PU-UlH" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <tapGestureRecognizer id="Nbz-kB-4Hj"/>
             </objects>
-            <point key="canvasLocation" x="-842.75362318840587" y="344.86607142857139"/>
+            <point key="canvasLocation" x="-842.75362318840587" y="344.83695652173918"/>
         </scene>
     </scenes>
     <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
+        <image name="angryFaceLarge" width="36" height="36"/>
         <image name="ic_gme_logo" width="40" height="40"/>
         <image name="ic_recipient_bg" width="355" height="226"/>
         <namedColor name="ThemeMainBackground">
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
index aef717ed..b7b6a86f 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift	
@@ -69,6 +69,7 @@ class SendMoneyReceiptViewController: UIViewController {
   @IBOutlet weak var moneygramImageView: UIImageView!
   @IBOutlet weak var moneygramLogoLabel: UILabel!
   @IBOutlet weak var warningLabel: UILabel!
+  @IBOutlet weak var moneygramStackView: UIStackView!
   
   // Body labels
   @IBOutlet weak var tansactionDateTitleLabel: UILabel!
@@ -266,7 +267,7 @@ class SendMoneyReceiptViewController: UIViewController {
     let fullName = firstName + " " + middleName + " " + lastName
     
     self.recieverNameLabelLabel.text = fullName.uppercased()
-    self.fullnameLabel.text = "To \(fullName.uppercased())"
+    self.fullnameLabel.text = "To: \(fullName.uppercased())"
     
     self.transactionDateLabel.text = reciept?.transactionDate
     
@@ -298,12 +299,12 @@ class SendMoneyReceiptViewController: UIViewController {
       
       if let imageData = reciept?.logoUrl,
         let url = URL(string: imageData) {
+        moneygramImageView.backgroundColor = .themeRed
         moneygramImageView.kf.setImage(with: url)
       }
       moneygramLogoLabel.text = reciept?.logoText
     } else {
-      moneygramImageView.isHidden = true
-      moneygramLogoLabel.isHidden = true
+      moneygramStackView.isHidden = true
     }
     warningLabel.text = reciept?.note
   }
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard
index 040ed04f..68b141cb 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard	
@@ -298,7 +298,7 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="c7W-ci-3o9">
-                                                                            <rect key="frame" x="0.0" y="66" width="330" height="25"/>
+                                                                            <rect key="frame" x="0.0" y="66.5" width="330" height="25"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ion-vp-h63">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="330" height="25"/>
@@ -327,7 +327,7 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="bYP-z7-pdo">
-                                                                            <rect key="frame" x="0.0" y="99" width="330" height="25"/>
+                                                                            <rect key="frame" x="0.0" y="99.5" width="330" height="25"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gi5-r4-dyO">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="330" height="25"/>
@@ -356,7 +356,7 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="IRO-hu-J2s">
-                                                                            <rect key="frame" x="0.0" y="131.5" width="330" height="25"/>
+                                                                            <rect key="frame" x="0.0" y="132.5" width="330" height="25"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cT0-TW-JtH">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="330" height="25"/>
@@ -383,13 +383,13 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="rk2-Ky-8dn">
-                                                                            <rect key="frame" x="0.0" y="164.5" width="330" height="47"/>
+                                                                            <rect key="frame" x="0.0" y="166" width="330" height="45.5"/>
                                                                             <subviews>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eR3-EP-Bkf">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="330" height="47"/>
+                                                                                    <rect key="frame" x="0.0" y="0.0" width="330" height="45.5"/>
                                                                                     <subviews>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Payout Agent/Bank" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="vzF-GP-Vyz">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="120" height="47"/>
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="120" height="45.5"/>
                                                                                             <constraints>
                                                                                                 <constraint firstAttribute="width" constant="120" id="djk-ZF-0dD"/>
                                                                                             </constraints>
@@ -398,7 +398,7 @@
                                                                                             <nil key="highlightedColor"/>
                                                                                         </label>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="aaslkdfjalskdjfalksdjfalksdjfalksdjflkasdjflaksdjflaksdjflaksdjflaksdjflaksdjflkasdjfalksdjfalksdjf" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="VpB-U7-5VE">
-                                                                                            <rect key="frame" x="120" y="0.0" width="210" height="47"/>
+                                                                                            <rect key="frame" x="120" y="0.0" width="210" height="45.5"/>
                                                                                             <fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="13"/>
                                                                                             <color key="textColor" name="ThemeText"/>
                                                                                             <nil key="highlightedColor"/>
@@ -494,10 +494,10 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="QPQ-CD-dbK">
-                                                    <rect key="frame" x="96.5" y="15" width="182" height="56"/>
+                                                    <rect key="frame" x="91.5" y="15" width="192" height="56"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I have read and agreed to " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yn5-1J-nDc">
-                                                            <rect key="frame" x="20" y="0.0" width="142.5" height="16"/>
+                                                            <rect key="frame" x="20" y="0.0" width="152.5" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="16" id="JdA-Lq-CBJ"/>
                                                             </constraints>
@@ -506,7 +506,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jdB-M7-bxd">
-                                                            <rect key="frame" x="0.0" y="19" width="182" height="20"/>
+                                                            <rect key="frame" x="0.0" y="19" width="192" height="20"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="20" id="0Vz-S9-ULW"/>
                                                             </constraints>
@@ -519,7 +519,7 @@
                                                             </connections>
                                                         </button>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1BJ-uU-LNZ">
-                                                            <rect key="frame" x="2" y="42" width="178" height="14"/>
+                                                            <rect key="frame" x="2.5" y="42" width="187" height="14"/>
                                                             <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="12"/>
                                                             <state key="normal" title="2. GME Remittance Fraud Warning">
                                                                 <color key="titleColor" name="ThemeRed"/>
diff --git a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard
index 5b470381..165c646a 100644
--- a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -477,6 +477,7 @@
             <point key="canvasLocation" x="629.60000000000002" y="75.112443778110944"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="ic_calender" width="25" height="25"/>
         <image name="ic_error" width="55" height="55"/>
@@ -491,5 +492,4 @@
             <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
diff --git a/GME Remit/Modules/RewardModules/Reward/User Interface/View/Reward.storyboard b/GME Remit/Modules/RewardModules/Reward/User Interface/View/Reward.storyboard
index 5dc6d7c4..0a87bb18 100644
--- a/GME Remit/Modules/RewardModules/Reward/User Interface/View/Reward.storyboard	
+++ b/GME Remit/Modules/RewardModules/Reward/User Interface/View/Reward.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
     <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -26,26 +26,26 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mVq-cj-kN9">
-                                <rect key="frame" x="10" y="10" width="355" height="264"/>
+                                <rect key="frame" x="10" y="10" width="355" height="132"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="starredBackground" translatesAutoresizingMaskIntoConstraints="NO" id="OUC-GY-cfV">
-                                        <rect key="frame" x="0.0" y="0.0" width="355" height="264"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="355" height="132"/>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note: The reward point is valid for a year only." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zsW-Jn-5cx">
-                                        <rect key="frame" x="45" y="245.5" width="265.5" height="15.5"/>
+                                        <rect key="frame" x="45" y="113.5" width="265.5" height="15.5"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="13"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_reward" translatesAutoresizingMaskIntoConstraints="NO" id="w0R-LI-YPR">
-                                        <rect key="frame" x="75.5" y="79" width="80" height="80"/>
+                                        <rect key="frame" x="75.5" y="19.5" width="80" height="80"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="80" id="0qu-ST-7fP"/>
                                             <constraint firstAttribute="width" constant="80" id="LaH-ji-hpA"/>
                                         </constraints>
                                     </imageView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="a1o-7y-Kgz">
-                                        <rect key="frame" x="184.5" y="94" width="98" height="50"/>
+                                        <rect key="frame" x="184.5" y="34.5" width="98" height="50"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reward Points" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vyv-ya-vvm">
                                                 <rect key="frame" x="0.0" y="0.0" width="98" height="17"/>
@@ -83,7 +83,7 @@
                                 </constraints>
                             </view>
                             <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="vmj-sE-fUF">
-                                <rect key="frame" x="10" y="314" width="355" height="343"/>
+                                <rect key="frame" x="10" y="182" width="355" height="475"/>
                                 <color key="backgroundColor" name="ThemeSubBackground"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="TUx-T5-4WL">
                                     <size key="itemSize" width="320" height="260"/>
@@ -216,7 +216,7 @@
                                 </cells>
                             </collectionView>
                             <segmentedControl opaque="NO" clipsSubviews="YES" contentMode="scaleAspectFit" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="pUS-5u-yiU">
-                                <rect key="frame" x="315" y="284" width="50" height="26"/>
+                                <rect key="frame" x="315" y="152" width="50" height="26"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="3Ig-8M-nEs"/>
@@ -265,26 +265,26 @@
             <point key="canvasLocation" x="847.20000000000005" y="232.53373313343329"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="collection0" width="128" height="128"/>
         <image name="ic_reward" width="74" height="74"/>
         <image name="list0" width="128" height="128"/>
         <image name="starredBackground" width="355" height="132"/>
         <namedColor name="ThemeMainBackground">
-            <color red="0.097999997437000275" green="0.097999997437000275" blue="0.097999997437000275" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeRed">
-            <color red="1" green="0.15299999713897705" blue="0.15299999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.92941176470588238" green="0.10588235294117647" blue="0.14117647058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeSeparate">
-            <color white="0.5" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color red="0.82400000095367432" green="0.82400000095367432" blue="0.82400000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="ThemeSubBackground">
-            <color red="0.14900000393390656" green="0.14900000393390656" blue="0.14900000393390656" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.93300002813339233" green="0.93300002813339233" blue="0.93300002813339233" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
         </namedColor>
         <namedColor name="ThemeText">
-            <color white="0.80299997329711914" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
-    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>