gme notification services text changed for kyc and verified state

GMERemittance.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>GMERemittance.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>33</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

GMERemittance/Model/User.swift

@@ -86,6 +86,7 @@ class UserContainer: Mappable {
 }
 
 class User: Mappable {
+    
     var userId: String?
     var firstName: String?
     var middleName: String?
@@ -122,6 +123,7 @@ class User: Mappable {
         
     }
     
+    
     func mapping(map: Map) {
           userId    <- map["userId"]
           firstName    <- map["firstName"]

GMERemittance/Module/Home/Application Logic/Interactor/HomeInteractor.swift

@@ -28,7 +28,9 @@ class HomeInteractor {
 
 extension HomeInteractor: HomeInteractorInput {
     func fetchUserInfo() {
-        self.service.fetchUserInfo(success: { user in
+        let userId = Utility.getMyUserName()
+        let param = ["userId" : userId]
+        self.service.fetchUserInfo(param: param, success: { user in
             self.output?.show(model: user)
             
         }) { error in

GMERemittance/Module/Home/Application Logic/Service/HomeServiceType.swift

@@ -14,14 +14,13 @@ protocol HomeServiceType: class, UserInfoService {
 
 
 protocol UserInfoService: ApiServiceType {
-    func fetchUserInfo(success: @escaping (User) -> (), failure: @escaping (Error) -> ())
+    func fetchUserInfo(param: [String: String], success: @escaping (User) -> (), failure: @escaping (Error) -> ())
 }
 
 extension UserInfoService {
-    func fetchUserInfo(success: @escaping (User) -> (), failure: @escaping (Error) -> ()) {
-//        let params = [ "userId": userId,    "password": password ]
-        let url = baseUrl + ""
-        auth.request(method: .post, url: url, params: nil, success: { (response: UserContainer ) in
+    func fetchUserInfo(param: [String: String], success: @escaping (User) -> (), failure: @escaping (Error) -> ()) {
+        let url = baseUrl + "mobile/refreshcutomerinformation"
+        auth.request(method: .post, url: url, params: param, success: { (response: UserContainer ) in
             if (response.errorCode ?? "") == "1" {
                 let error = NSError.init(domain: "Network", code: 0, userInfo: [NSLocalizedDescriptionKey : response.message ?? ""])
                 failure(error)

GMERemittance/Module/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift

@@ -15,12 +15,18 @@ class HomeRemainingLimitTableViewCell: UITableViewCell {
     @IBOutlet weak var rewardPointAmountLabel: UILabel!
     @IBOutlet weak var userNameLabel: UILabel!
     
+    var user: User?
+    
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
     }
 
     func setup() {
+        self.amountLabel.text
+         = self.user?.yearlyLimit
+        self.userNameLabel.text = user?.firstName
+        self.rewardPointAmountLabel.text = user?.rewardPoint ?? "0"
         self.pointBackgroundView.layer.cornerRadius = 5
     }
 

GMERemittance/Module/Home/User Interface/View/Home.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" 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="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -338,6 +338,7 @@
                         <outlet property="verificationCloseButton" destination="QG7-II-o7B" id="tdB-PN-ZJX"/>
                         <outlet property="verificationNoticeHeightConstraint" destination="VxG-Dr-LRY" id="80H-Oh-yg2"/>
                         <outlet property="verificationNoticeView" destination="alB-Pe-T92" id="1Di-cQ-gdP"/>
+                        <outlet property="verificationText" destination="rwJ-pQ-p9z" id="40u-EV-EKU"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8je-5K-XuW" userLabel="First Responder" sceneMemberID="firstResponder"/>

GMERemittance/Module/Home/User Interface/View/HomeViewController.swift

@@ -25,6 +25,8 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
     @IBOutlet weak var verificationNoticeHeightConstraint: NSLayoutConstraint!
     @IBOutlet var verificationNoticeView: UIView!
     @IBOutlet weak var verificationCloseButton: UIButton!
+    @IBOutlet weak var verificationText: UILabel!
+    
     // MARK: Properties
     var refreshControl = UIRefreshControl()
     var presenter: HomeModuleInterface?
@@ -33,6 +35,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
             // update
             self.save(user: user)
             self.showUnverifiedNotice()
+            self.tableView.reloadData()
         }
     }
     var sections: [Sections] = [.balance, .collection]
@@ -137,7 +140,6 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
         presenter?.refreshData()
     }
     
-    
     @objc func showNotification(){
         performSegue(withIdentifier: "notification", sender: nil)
     }
@@ -214,6 +216,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
     }
     
     private func showUnverifiedNotice() {
+        setVerificationText()
         if shouldShowUnverifiedNotice() {
             UIView.animate(withDuration: 0.33) {
                 self.verificationNoticeHeightConstraint.constant = Constants.verificationNoticeHeight
@@ -227,6 +230,34 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
         }
     }
     
+    private func setVerificationText() {
+        if didNotSubmitKycAndNotVerified() {
+            self.verificationText.text = "Kindly complete your registration process with us to start using GME services."
+        }else
+        if didSubmitKycAndNotVerified() {
+            self.verificationText.text = "Your registration request is in approval process. You will soon be able to use GME services."
+        }
+        
+        if didSubmitKycAndVerified() {
+            self.verificationNoticeHeightConstraint.constant = 0
+            self.verificationNoticeView.alpha = 0
+        }
+    }
+    
+    private func didSubmitKycAndNotVerified() -> Bool {
+        return Utility.didSubmitKyc() && !Utility.isVerifiedUser()
+    }
+    
+    private func didSubmitKycAndVerified() -> Bool {
+         return Utility.didSubmitKyc() && Utility.isVerifiedUser()
+    }
+    
+    private func didNotSubmitKycAndNotVerified() -> Bool {
+         return !Utility.didSubmitKyc() && !Utility.isVerifiedUser()
+    }
+    
+    
+    
     @IBAction func showKyc(_ sender: UITapGestureRecognizer) {
         self.presenter?.showKyc()
     }
@@ -322,7 +353,10 @@ extension HomeViewController: HomeViewInterface {
     func endRefreshing() {
         if self.tableView.refreshControl?.isRefreshing == true {
             self.tableView.refreshControl?.endRefreshing()
+            UIView.animate(withDuration: 0.5, delay: 0, options: [], animations: {
                 self.tableView.contentOffset.y = 0
+                self.view.layoutIfNeeded()
+            })
         }
     }
 }
@@ -369,6 +403,7 @@ extension HomeViewController: UITableViewDataSource {
     
     func configureRemainingLimitCell(tableView: UITableView,  indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "HomeRemainingLimitTableViewCell") as! HomeRemainingLimitTableViewCell
+        cell.user = self.user
         cell.setup()
         return cell
     }

GMERemittance/Module/New Group/Kyc/Application Logic/Interactor/KycInteractor.swift

@@ -178,7 +178,7 @@ class KycInteractor {
     }
     
     private func getCompressedImage(image: UIImage) -> Data? {
-        return UIImageJPEGRepresentation(image, 0.5)
+        return UIImageJPEGRepresentation(image, 0.6)
     }
     
     private func getParams(model: KYCRequestModel) -> [String: String] {
@@ -219,6 +219,7 @@ extension KycInteractor: KycInteractorInput {
         let result3 = self._validate(model: model.kycForm3)
         
         let shouldSubmit = result1.isValid && result2.isValid && result3.isValid
+//        let shouldSubmit = result1.isValid && result2.isValid
         if shouldSubmit {
             /// call api here.
             let params = self.getParams(model: model)

GMERemittance/RestApiManager.swift

@@ -2342,7 +2342,7 @@ class RestApiMananger {
         } else {
             fileName = "test.jpg"
             mimeType = "image/jpeg"
-            data = UIImageJPEGRepresentation(imageData as! UIImage, 0.25)!
+            data = UIImageJPEGRepresentation(imageData as! UIImage, 0.7)!
         }
         
  

GMERemittance/Utility/AppConstants.swift

@@ -50,13 +50,19 @@ class Utility {
     }
     
     static func isVerifiedUser() -> Bool {
-        return false
         let val = (UserDefaults.standard.object(forKey: UserKeys.verified) as? Bool ) ?? false
         print("value is")
         print(val)
         return val
     }
     
+    static func didSubmitKyc() -> Bool {
+        let val = (UserDefaults.standard.object(forKey: UserKeys.kyc) as? Bool ) ?? false
+        print("value is")
+        print(val)
+        return val
+    }
+
     static func getMyUserName() -> String {
         let defaults = UserDefaults.standard
         let myUsername = defaults.string(forKey: UserKeys.userId) ?? ""

Pods/Pods.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -17,127 +17,127 @@
 		<key>BRYXBanner.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 		<key>Bolts.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>3</integer>
 		</dict>
 		<key>FBSDKCoreKit.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>7</integer>
 		</dict>
 		<key>FBSDKShareKit.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>8</integer>
 		</dict>
 		<key>FLAnimatedImage.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>12</integer>
 		</dict>
 		<key>FacebookCore.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>5</integer>
 		</dict>
 		<key>FacebookShare.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 		<key>FirebaseAuth.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>9</integer>
 		</dict>
 		<key>FirebaseCore.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>10</integer>
 		</dict>
 		<key>FirebaseMessaging.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>11</integer>
 		</dict>
 		<key>GTMSessionFetcher.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>14</integer>
 		</dict>
 		<key>GoogleToolboxForMac.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>13</integer>
 		</dict>
 		<key>Hex.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>15</integer>
 		</dict>
 		<key>IQKeyboardManagerSwift.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>16</integer>
 		</dict>
 		<key>LGSideMenuController.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>17</integer>
 		</dict>
 		<key>MBProgressHUD.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>18</integer>
 		</dict>
 		<key>ObjectMapper.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>20</integer>
 		</dict>
 		<key>PMAlertController-PMAlertController.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>22</integer>
 		</dict>
 		<key>PMAlertController.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>21</integer>
 		</dict>
 		<key>Pods-GMERemittance.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>22</integer>
+			<integer>23</integer>
 		</dict>
 		<key>Pods-GMERemittanceTests.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>24</integer>
 		</dict>
 		<key>Pods-GMERemittanceUITests.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>24</integer>
+			<integer>25</integer>
 		</dict>
 		<key>Protobuf.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>26</integer>
 		</dict>
 		<key>RAMAnimatedTabBarController.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>27</integer>
 		</dict>
 		<key>RSKImageCropper.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>27</integer>
+			<integer>28</integer>
 		</dict>
 		<key>ReadMoreTextView.xcscheme</key>
 		<dict>
@@ -147,32 +147,32 @@
 		<key>SDWebImage.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>28</integer>
+			<integer>29</integer>
 		</dict>
 		<key>SwiftyJSON.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>29</integer>
+			<integer>30</integer>
 		</dict>
 		<key>XLPagerTabStrip-XLPagerTabStrip.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>32</integer>
+			<integer>33</integer>
 		</dict>
 		<key>XLPagerTabStrip.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>31</integer>
+			<integer>32</integer>
 		</dict>
 		<key>nanopb.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>18</integer>
+			<integer>19</integer>
 		</dict>
 		<key>thenPromise.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>30</integer>
+			<integer>31</integer>
 		</dict>
 	</dict>
 </dict>