bug fixes

GME Remit/Modules/Loyality Points/User Interface/View/LoyalityPoints.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" 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" 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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -26,32 +26,32 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="loyalty-mobile" translatesAutoresizingMaskIntoConstraints="NO" id="vEl-RO-Fdq">
-                                <rect key="frame" x="0.0" y="20" width="375" height="200"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="200"/>
                                 <color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="200" id="CYV-Vo-bdb"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2 more to go" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qzP-qW-YoP">
-                                <rect key="frame" x="119" y="260" width="137" height="28"/>
+                                <rect key="frame" x="117.5" y="240" width="140" height="29"/>
                                 <fontDescription key="fontDescription" name="SanFranciscoText-Semibold" family="San Francisco Text" pointSize="24"/>
                                 <color key="textColor" name="ThemeBlack"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send 2 more transaction to get free service charge on next transaction." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fLk-6S-3ni">
-                                <rect key="frame" x="36" y="304" width="303" height="41"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Send 2 more transaction to get free service charge on next transaction." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fLk-6S-3ni">
+                                <rect key="frame" x="36" y="277" width="303" height="41"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t2n-m5-vXp">
-                                <rect key="frame" x="0.0" y="377" width="375" height="72"/>
+                                <rect key="frame" x="0.0" y="350" width="375" height="87"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tJP-SX-QeS">
-                                        <rect key="frame" x="14" y="14" width="347" height="44"/>
+                                        <rect key="frame" x="14" y="14" width="347" height="59"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="1p0-bY-qn6">
-                                                <rect key="frame" x="16" y="8" width="315" height="28"/>
+                                                <rect key="frame" x="16" y="8" width="315" height="43"/>
                                             </stackView>
                                         </subviews>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -72,11 +72,11 @@
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JeR-Uy-WvU">
-                                <rect key="frame" x="112.5" y="481" width="150" height="40"/>
+                                <rect key="frame" x="105.5" y="469" width="164" height="52"/>
                                 <color key="backgroundColor" red="0.1803921568627451" green="0.53725490196078429" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="5bx-hh-pPQ"/>
-                                    <constraint firstAttribute="width" constant="150" id="TKj-Jy-pij"/>
+                                    <constraint firstAttribute="height" constant="52" id="5bx-hh-pPQ"/>
+                                    <constraint firstAttribute="width" constant="164" id="TKj-Jy-pij"/>
                                 </constraints>
                                 <color key="tintColor" name="ThemeMainBackground"/>
                                 <state key="normal" title="Button"/>
@@ -96,7 +96,7 @@
                             <constraint firstItem="vEl-RO-Fdq" firstAttribute="top" secondItem="y1H-iV-BwG" secondAttribute="bottom" id="E8f-oE-3DH"/>
                             <constraint firstItem="fLk-6S-3ni" firstAttribute="leading" secondItem="9Uc-9s-KgO" secondAttribute="leading" constant="36" id="EY3-0g-y2u"/>
                             <constraint firstItem="PYB-Kq-ghm" firstAttribute="top" secondItem="JeR-Uy-WvU" secondAttribute="bottom" constant="146" id="Hcu-Yb-b1x"/>
-                            <constraint firstItem="fLk-6S-3ni" firstAttribute="top" secondItem="qzP-qW-YoP" secondAttribute="bottom" constant="16" id="K9f-Jm-oJ8"/>
+                            <constraint firstItem="fLk-6S-3ni" firstAttribute="top" secondItem="qzP-qW-YoP" secondAttribute="bottom" constant="8" id="K9f-Jm-oJ8"/>
                             <constraint firstItem="JeR-Uy-WvU" firstAttribute="top" secondItem="t2n-m5-vXp" secondAttribute="bottom" constant="32" id="Nue-JF-mAd"/>
                             <constraint firstItem="qzP-qW-YoP" firstAttribute="top" secondItem="vEl-RO-Fdq" secondAttribute="bottom" constant="40" id="SdE-G1-Zju"/>
                             <constraint firstItem="t2n-m5-vXp" firstAttribute="top" secondItem="fLk-6S-3ni" secondAttribute="bottom" constant="32" id="VgG-nT-dkc"/>

GME Remit/Modules/Loyality Points/User Interface/View/LoyalityPointsViewController.swift

@@ -32,6 +32,7 @@ class LoyalityPointsViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.setup()
+        self.fetchData()
         self.title = "Loyality Points"
 //        self.presenter?.viewInitiated()
     }
@@ -43,6 +44,10 @@ class LoyalityPointsViewController: UIViewController {
     
     // MARK: Other Functions
     
+    
+    private func fetchData() {
+        self.presenter?.viewInitiated()
+    }
     private func setup() {
         // all setup should be done here
         setupView()
@@ -60,9 +65,13 @@ class LoyalityPointsViewController: UIViewController {
     }
     
     func renderData() {
+        
+        titleLabel.font = .sanfrancisco(.semibold, size: 20)
+        descLabel.font = .sanfrancisco(.semibold, size: 16)
+        
         titleLabel.text = loyalityPoint.loyaltyMsgHead
         descLabel.text = loyalityPoint.loyaltyMsgBody
-        
+        descLabel.textColor = .themeBlack.withAlphaComponent(0.6)
         for i in 0...Int(loyalityPoint.totalCount ?? "0")! - 1 {
             if i < Int(loyalityPoint.tranCount ?? "0")! {
                 loyalityPointStackView.addArrangedSubview(createView(true))
@@ -75,9 +84,11 @@ class LoyalityPointsViewController: UIViewController {
     
     func createView(_ isStar: Bool) -> UIView {
         let part = UIImageView()
+//        part.frame.size.width = 24
+//        part.frame.size.height = 24
         part.image = UIImage(named: isStar ? "loyalty-star-dot" : "loyalty-circle_border")
         NSLayoutConstraint.activate([
-            part.widthAnchor.constraint(equalToConstant: 30),
+            part.widthAnchor.constraint(equalToConstant: 18),
             part.heightAnchor.constraint(equalTo: part.widthAnchor, multiplier: 1)
         ])
         return part

GME Remit/Modules/SideMenu/SettingViewController.swift

@@ -203,9 +203,9 @@ class SettingViewController: UIViewController {
         basicInformationLabel.text = "baisc_information".localized()
         profileLabel.text = "profile_title_text".localized()
         accountTitleLabel.text = "jme_wallet_no_text_1".localized()
-        accountDetailLabel.text = "account_detail".localized()
+        accountDetailLabel.text = GMEDB.shared.user.string(.walletNumber) ?? ""
         referTitleLabel.text = "refer_and_earn_text".localized()
-        rewardPointLabel.text = "reward_point".localized()
+        rewardPointLabel.text = (GMEDB.shared.user.string(.rewardPoints) ?? "") + " " + "reward_point".localized()
         renewIdLabel.text = "renewId_text".localized()
         loyaltyPointsLabel.text = "loyalty_points".localized()
         paymentInfoLabel.text = "payment_information".localized()
@@ -216,7 +216,7 @@ class SettingViewController: UIViewController {
         securitySettingsLabel.text = "security_setting".localized()
         changePinLabel.text = "changepin_text".localized()
         enableBiometricLabel.text = "enable_biometrics".localized()
-        fingerPrintLabel.text = "use_fingerprint_for_payment".localized()
+        fingerPrintLabel.text = "use_fingerprint_for_login".localized()
         supportLabel.text = "support_text".localized()
         contactUsLabel.text = "contact_us".localized()
         aboutUsLabel.text = "about_us".localized()
@@ -297,7 +297,6 @@ class SettingViewController: UIViewController {
 
         profileLabel.text = "profile_title_text".localized()
         accountTitleLabel.text = "account_number_text".localized()
-        referTitleLabel.text = "refer_and_earn_text".localized()
         renewIdLabel.text = "renewId_text".localized()
         changePasswordLabel.text = "change_password_text".localized()
         privacyPolicyLabel.setTitle("privacyAndPolicy_text".localized(), for: .normal)

GME Remit/MultiLanguages/en.lproj/Localizable.strings

@@ -90,7 +90,7 @@
 "auto_debit_account_text" = "Auto Debit Account";
 "about_gme_text" = "About JME";
 "settings_text" = "Settings";
-"logout_text" = "Logout";
+"logout_text" = "LOG OUT";
 "logout_confirmation_title_text" = "Logout";
 "logout_confirmation_text" = "Are you sure you want to logout?";
 "exit_confirmation_text" = "Are you sure want to exit?";
@@ -1005,14 +1005,14 @@
 //profile new text
 "baisc_information" = "Basic Information";
 "account_detail" = "Contact us to get your Lawson Card";
-"reward_point" = "0 reward points";
+"reward_point" = "reward points";
 "loyalty_points" = "Loyalty Points";
 "payment_information" = "Payment information";
 "account" = "Account";
 "language_selection" = "Language Selection";
 "security_setting" = "Security Settings";
 "enable_biometrics" = "Enable Biometrics";
-"use_fingerprint_for_payment" = "Use fingerprint for payment";
+"use_fingerprint_for_login" = "Use fingerprint for login";
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";

GME Remit/Supported Files/Assets.xcassets/backIconBlack.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "arrow_back_ios-24px.png",
       "idiom" : "universal",
-      "filename" : "Group 2.png",
       "scale" : "1x"
     },
     {
+      "filename" : "arrow_back_ios-24px@2x.png",
       "idiom" : "universal",
-      "filename" : "Group 2@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "arrow_back_ios-24px@3x.png",
       "idiom" : "universal",
-      "filename" : "Group 2@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

GME Remit/Supported Files/Assets.xcassets/backIconWhite.imageset/Contents.json

@@ -2,22 +2,20 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Group.png",
       "scale" : "1x"
     },
     {
+      "filename" : "back.png",
       "idiom" : "universal",
-      "filename" : "Group@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "Group@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

GME Remit/Supported Files/Assets.xcassets/back_icon.imageset/Contents.json

@@ -1,24 +1,26 @@
 {
   "images" : [
     {
+      "filename" : "arrow_back_ios-24px.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "arrow_back_ios-24px@2x.png",
       "idiom" : "universal",
-      "filename" : "back.pdf",
       "scale" : "2x"
     },
     {
+      "filename" : "arrow_back_ios-24px@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "original"
   }
-}
+}

GME Remit/Supported Files/Assets.xcassets/back_icon.imageset/back.pdf

@@ -1 +0,0 @@
-

GME Remit/Utilities/ExchangeRateCustomView.swift

@@ -36,6 +36,7 @@ class ExchangeRateCustomView: UIView {
     
     private var textfield: CurrencyTextField = {
         let textfield = CurrencyTextField()
+        textfield.keyboardType = .numberPad
         textfield.tintColor = .theme2E89FF
         textfield.textColor = .init(hex: "#2E89FF").withAlphaComponent(0.87)
         textfield.font = .sanfrancisco(.semibold, size: 16)