From 690ac3fcca16639b64ade7f53528c736ab9c9ab6 Mon Sep 17 00:00:00 2001
From: Naina Maharjan <nainamaharjan@Nainas-Office-MacBook-Pro.local>
Date: Wed, 24 May 2023 17:21:29 +0545
Subject: [PATCH 1/2] commit

---
 .DS_Store                                     | Bin 12292 -> 12292 bytes
 .../Wireframe/LoyalityPointsWireframe.swift   |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.DS_Store b/.DS_Store
index 05b7dc9a24c872b68c9c01644a9b862498791088..2ffc68183c7bc2627ade6df8f51fe84cfe7bd36b 100644
GIT binary patch
delta 219
zcmZokXi1oGj9tX$(CX)WM>n1=<7eV*nB1tYJ-I+&B0G}=Hv<EM=;TCU;mPv_#U*m{
zU0jlK@{@pq9ClNm?0Ug>)DcZV3O)rY>`Vzj^#~I;e-UhAVfWGY>jT<8xmL^+iLE)=
wOn`6m2eFd^%$%O{Cr;3roFm2sbLr-v>Ic}7#D$<fa7<w+F32zpPR`E-0CO-%*Z=?k

delta 215
zcmZokXi1oGjJ=~|g_CCbk&S1|_?b8^Om0-yo?IX>k)5?_Edv9C=;TCU;mPv_#U*m{
zU0jlK@{@pq941YT&Ut)C9nln|;8UQ&&iVkT9%16<FM>@h>|tmBG%KecnOrMoip193
y{7CG&05it~&xsRsCg+H8u`kTxc3YW#Wb;q;1MEoRLQrwX6o%r048!2${9FK9n@7U{

diff --git a/GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift b/GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift
index 94b2041c..6ec85a78 100644
--- a/GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift	
+++ b/GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift	
@@ -11,6 +11,7 @@ import UIKit
 class LoyalityPointsWireframe {
      weak var view: UIViewController!
     private lazy var recipientsWireframe: RecipientsWireframe = { RecipientsWireframe() }()
+    private lazy var allRecipientsWireframe: AllRecipientsWireframe = { AllRecipientsWireframe() }()
 }
 
 extension LoyalityPointsWireframe: LoyalityPointsWireframeInput {
@@ -35,7 +36,7 @@ extension LoyalityPointsWireframe: LoyalityPointsWireframeInput {
     
     func openSendMoneyView() {
         if let navVC = view.navigationController {
-            navVC.push(recipientsWireframe.getMainView(), animated: true)
+            navVC.push(allRecipientsWireframe.getMainView(), animated: true)
         }
     }
 }

From 22acc7d9be97c332be0518bcd8e1126b37792682 Mon Sep 17 00:00:00 2001
From: Naina Maharjan <nainamaharjan@Nainas-Office-MacBook-Pro.local>
Date: Wed, 24 May 2023 18:01:19 +0545
Subject: [PATCH 2/2] home and profile view issue fixes

---
 .../View/BeneficiaryDetail.storyboard         | 28 +++++++++----------
 .../View/BeneficiaryDetailHeaderView.xib      | 18 ++++++------
 .../Home/User Interface/View/Home.storyboard  |  8 +++---
 .../Wireframe/LoyalityPointsWireframe.swift   |  8 ++++--
 .../Profile/ProfileViewController.swift       |  1 +
 GME Remit/Modules/SideMenu/Setting.storyboard | 14 +++++-----
 .../SideMenu/SettingViewController.swift      |  6 ++++
 7 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
index eb24cd25..160334f9 100644
--- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard	
+++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" 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="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -24,7 +24,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Msg-ak-twI">
-                                <rect key="frame" x="0.0" y="20" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="SgC-Zr-M2U">
                                         <rect key="frame" x="16" y="16" width="343" height="18"/>
@@ -59,7 +59,7 @@
                                 </constraints>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="nhb-o1-ekZ">
-                                <rect key="frame" x="20" y="70" width="335" height="486"/>
+                                <rect key="frame" x="20" y="50" width="335" height="506"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="BeneficiaryTableViewCell" rowHeight="203" id="Zvf-x1-Wi5" customClass="BeneficiaryTableViewCell" customModule="JME_Remit" customModuleProvider="target">
@@ -96,7 +96,7 @@
                                                                             </constraints>
                                                                         </imageView>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Cnn-41-XDg">
-                                                                            <rect key="frame" x="56" y="0.0" width="193" height="82"/>
+                                                                            <rect key="frame" x="56" y="0.0" width="193" height="92"/>
                                                                             <subviews>
                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IME Pay Mobile Wallet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ae7-L0-gY3">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="193" height="14"/>
@@ -105,29 +105,29 @@
                                                                                     <nil key="highlightedColor"/>
                                                                                 </label>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Lh7-U6-fWO">
-                                                                                    <rect key="frame" x="0.0" y="22" width="193" height="60"/>
+                                                                                    <rect key="frame" x="0.0" y="22" width="193" height="70"/>
                                                                                     <subviews>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="doi-P7-z1R">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="193" height="12"/>
-                                                                                            <fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="193" height="14.5"/>
+                                                                                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
                                                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                             <nil key="highlightedColor"/>
                                                                                         </label>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O58-Ke-fq6">
-                                                                                            <rect key="frame" x="0.0" y="16" width="193" height="12"/>
-                                                                                            <fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
+                                                                                            <rect key="frame" x="0.0" y="18.5" width="193" height="14.5"/>
+                                                                                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
                                                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                             <nil key="highlightedColor"/>
                                                                                         </label>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9uL-wQ-mZd">
-                                                                                            <rect key="frame" x="0.0" y="32" width="193" height="12"/>
-                                                                                            <fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
+                                                                                            <rect key="frame" x="0.0" y="37" width="193" height="14.5"/>
+                                                                                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
                                                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                             <nil key="highlightedColor"/>
                                                                                         </label>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jsp-NN-jLM">
-                                                                                            <rect key="frame" x="0.0" y="48" width="193" height="12"/>
-                                                                                            <fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
+                                                                                            <rect key="frame" x="0.0" y="55.5" width="193" height="14.5"/>
+                                                                                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
                                                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                             <nil key="highlightedColor"/>
                                                                                         </label>
diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib
index c81b90a9..82cb9b4f 100644
--- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib	
+++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -52,7 +52,7 @@
                                     </subviews>
                                 </stackView>
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Cqd-2Y-S86">
-                                    <rect key="frame" x="128" y="0.0" width="455" height="136"/>
+                                    <rect key="frame" x="128" y="0.0" width="455" height="137"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CCk-EB-IRl">
                                             <rect key="frame" x="0.0" y="0.0" width="455" height="28"/>
@@ -86,7 +86,7 @@
                                             </subviews>
                                         </stackView>
                                         <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="nLI-6r-icB">
-                                            <rect key="frame" x="0.0" y="36" width="455" height="28"/>
+                                            <rect key="frame" x="0.0" y="36" width="455" height="29"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-smartphone-94" translatesAutoresizingMaskIntoConstraints="NO" id="dgU-AV-hy1">
                                                     <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
@@ -97,7 +97,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="W5h-nA-8vi">
-                                                    <rect key="frame" x="32" y="0.0" width="423" height="28"/>
+                                                    <rect key="frame" x="32" y="0.0" width="423" height="29"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mobile Number" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fsd-2X-Yg1">
                                                             <rect key="frame" x="0.0" y="0.0" width="423" height="12"/>
@@ -106,8 +106,8 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9860636112" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eC0-je-pC7">
-                                                            <rect key="frame" x="0.0" y="12" width="423" height="16"/>
-                                                            <fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="16"/>
+                                                            <rect key="frame" x="0.0" y="12" width="423" height="17"/>
+                                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
@@ -116,7 +116,7 @@
                                             </subviews>
                                         </stackView>
                                         <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="WAL-nn-fmB">
-                                            <rect key="frame" x="0.0" y="72" width="455" height="28"/>
+                                            <rect key="frame" x="0.0" y="73" width="455" height="28"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-people-94" translatesAutoresizingMaskIntoConstraints="NO" id="0e3-j0-Rkg">
                                                     <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
@@ -146,7 +146,7 @@
                                             </subviews>
                                         </stackView>
                                         <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="NUo-GK-jR6">
-                                            <rect key="frame" x="0.0" y="108" width="455" height="28"/>
+                                            <rect key="frame" x="0.0" y="109" width="455" height="28"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-location-94" translatesAutoresizingMaskIntoConstraints="NO" id="sMg-xb-OHS">
                                                     <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
diff --git a/GME Remit/Modules/Home/User Interface/View/Home.storyboard b/GME Remit/Modules/Home/User Interface/View/Home.storyboard
index 708a0ada..17f2ad01 100644
--- a/GME Remit/Modules/Home/User Interface/View/Home.storyboard	
+++ b/GME Remit/Modules/Home/User Interface/View/Home.storyboard	
@@ -154,14 +154,14 @@
                                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB000110" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2D3-BA-yV3">
-                                                        <rect key="frame" x="16" y="36" width="109" height="32.5"/>
-                                                        <fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="20"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB447110" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2D3-BA-yV3">
+                                                        <rect key="frame" x="16" y="36" width="92.5" height="32.5"/>
+                                                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0B9-0a-Jlt">
-                                                        <rect key="frame" x="133" y="44" width="13" height="17"/>
+                                                        <rect key="frame" x="116.5" y="44" width="13" height="17"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="13" id="PY1-YE-0vx"/>
                                                             <constraint firstAttribute="height" constant="17" id="a2I-Sr-5OW"/>
diff --git a/GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift b/GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift
index 6ec85a78..59dd5d1d 100644
--- a/GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift	
+++ b/GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift	
@@ -35,8 +35,12 @@ extension LoyalityPointsWireframe: LoyalityPointsWireframeInput {
     }
     
     func openSendMoneyView() {
-        if let navVC = view.navigationController {
-            navVC.push(allRecipientsWireframe.getMainView(), animated: true)
+//        if let navVC = view.navigationController {
+//            navVC.push(allRecipientsWireframe.getMainView(), animated: true)
+//        }
+        
+        if let navigation = view.navigationController {
+            AllRecipientsWireframe().openAllRecipients(source: navigation)
         }
     }
 }
diff --git a/GME Remit/Modules/Profile/ProfileViewController.swift b/GME Remit/Modules/Profile/ProfileViewController.swift
index c7049774..3038002a 100644
--- a/GME Remit/Modules/Profile/ProfileViewController.swift	
+++ b/GME Remit/Modules/Profile/ProfileViewController.swift	
@@ -94,6 +94,7 @@ class ProfileViewController: UIViewController {
     
     func show() {
         let name = GMEDB.shared.user.string(.firstName)
+        let isVerified = GMEDB.shared.user.string(.verified)
         self.labelUserName?.text = name?.uppercased()
         self.labelMobileNumber.text = GMEDB.shared.user.string(.mobileNumber)
         self.labelEmail.text = GMEDB.shared.user.string(.email)
diff --git a/GME Remit/Modules/SideMenu/Setting.storyboard b/GME Remit/Modules/SideMenu/Setting.storyboard
index 807b93b1..78a637d6 100644
--- a/GME Remit/Modules/SideMenu/Setting.storyboard	
+++ b/GME Remit/Modules/SideMenu/Setting.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" 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="21507" 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="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -19,7 +19,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CeA-3t-iCj">
-                                <rect key="frame" x="0.0" y="20" width="375" height="1080"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="1100"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u7J-jx-kQ1">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="1350"/>
@@ -63,7 +63,7 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="r5D-EE-JVM">
-                                                                <rect key="frame" x="80" y="232" width="215" height="16"/>
+                                                                <rect key="frame" x="90.5" y="232" width="194" height="16"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB000110" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Hd-kg-Yh4">
                                                                         <rect key="frame" x="0.0" y="0.0" width="83" height="16"/>
@@ -87,8 +87,8 @@
                                                                         <nil key="textColor"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="kSp-BU-O0l">
-                                                                        <rect key="frame" x="199" y="0.0" width="16" height="16"/>
+                                                                    <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="kSp-BU-O0l">
+                                                                        <rect key="frame" x="194" y="0.0" width="16" height="16"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="width" constant="16" id="vmk-nY-QKg"/>
                                                                         </constraints>
@@ -310,7 +310,7 @@
                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MSU-xb-tWA">
                                                                                 <rect key="frame" x="327" y="0.0" width="16" height="55"/>
                                                                                 <subviews>
-                                                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="41C-LK-IVs">
+                                                                                    <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="41C-LK-IVs">
                                                                                         <rect key="frame" x="0.0" y="19.5" width="16" height="16"/>
                                                                                         <constraints>
                                                                                             <constraint firstAttribute="width" constant="16" id="GLb-In-rxs"/>
diff --git a/GME Remit/Modules/SideMenu/SettingViewController.swift b/GME Remit/Modules/SideMenu/SettingViewController.swift
index ad1c1d7d..dd876d3d 100644
--- a/GME Remit/Modules/SideMenu/SettingViewController.swift	
+++ b/GME Remit/Modules/SideMenu/SettingViewController.swift	
@@ -156,6 +156,12 @@ class SettingViewController: UIViewController {
     }
     override func viewDidLoad() {
         super.viewDidLoad()
+        let isVerified = GMEDB.shared.user.string(.verified) ?? ""
+        print("isver", isVerified)
+        if (isVerified != "1") { 
+            verificationStatusButton.isHidden = true
+        }
+        
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(setText),