From 05455a79f82f705d70c85f4596a91cc4c7238aef Mon Sep 17 00:00:00 2001
From: Jeongbae Kong <jubakong1@gmail.com>
Date: Mon, 20 Apr 2020 11:59:50 +0900
Subject: [PATCH] Done optimizing UI for 3.4.0

---
 GME Remit/Models/Response/User.swift                 |  2 +-
 .../User Interface/View/PhoneCardRecharge.storyboard |  2 +-
 .../View/PersonalInformation.storyboard              |  2 +-
 .../View/SendMoneyExchangeRate.storyboard            | 12 ++++++------
 GME Remit/Modules/SideMenu/SideMenu.storyboard       |  2 +-
 .../Modules/SideMenu/SideMenuViewController.swift    |  3 +++
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/GME Remit/Models/Response/User.swift b/GME Remit/Models/Response/User.swift
index a9e8fc1c..87c9ecf7 100644
--- a/GME Remit/Models/Response/User.swift	
+++ b/GME Remit/Models/Response/User.swift	
@@ -83,7 +83,7 @@ class User: Mappable {
     middleName <- map["middleName"]
     lastName <- map["lastName"]
     nickName <- map["nickName"]
-    email <- map["email"]
+    email <- map["customerEmail"]
     mobileNumber <- map["mobileNumber"]
     rewardPoint <- map["rewardPoint"]
     walletNumber <- map["walletNumber"]
diff --git a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard
index 498f3be9..fe1e5670 100644
--- a/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard	
+++ b/GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard	
@@ -3,7 +3,7 @@
     <device id="retina5_9" 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"/>
diff --git a/GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard b/GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard
index cfbb7ea3..cbe88296 100644
--- a/GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard	
+++ b/GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard	
@@ -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"/>
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
index 0595aeb5..91b7bc5d 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard	
@@ -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" 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="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"/>
@@ -563,18 +563,18 @@
             <point key="canvasLocation" x="285.60000000000002" y="89.505247376311857"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="Korea" width="40" height="40"/>
         <image name="ic_dropdownSmall" width="6" height="3"/>
         <namedColor name="ThemeMainBackground">
-            <color red="0.14901960784313725" green="0.14901960784313725" blue="0.14901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="1" blue="1" 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="ThemeText">
-            <color white="0.80256043313300773" 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/SideMenu/SideMenu.storyboard b/GME Remit/Modules/SideMenu/SideMenu.storyboard
index f4a114ff..2dad64ec 100644
--- a/GME Remit/Modules/SideMenu/SideMenu.storyboard	
+++ b/GME Remit/Modules/SideMenu/SideMenu.storyboard	
@@ -3,7 +3,7 @@
     <device id="retina5_5" 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"/>
diff --git a/GME Remit/Modules/SideMenu/SideMenuViewController.swift b/GME Remit/Modules/SideMenu/SideMenuViewController.swift
index e8fdc63b..9c2f9b07 100644
--- a/GME Remit/Modules/SideMenu/SideMenuViewController.swift	
+++ b/GME Remit/Modules/SideMenu/SideMenuViewController.swift	
@@ -243,6 +243,9 @@ class SideMenuViewController: UIViewController {
     GMEDB.shared.user.rx.string(key: .email).bind(to: labelEmail.rx.text)
       .disposed(by: disposeBag)
     
+    let test = GMEDB.shared.user.rx.string(key: .email)
+    print("TEST IS POSSIBLE \(test)")
+  
     //NAME
     GMEDB.shared.user.rx.string(key: .firstName).map {$0?.capitalized}.bind(to: labelProfileName.rx.text)
       .disposed(by: disposeBag)