new user text changed to new registration

GME Remit.xcodeproj/project.pbxproj

@@ -7588,7 +7588,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;
@@ -7604,7 +7604,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
 				);
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.4;
 				"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
 				OTHER_LDFLAGS = (
 					"$(OTHER_LDFLAGS)",
@@ -7629,7 +7629,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;
@@ -7645,7 +7645,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
 				);
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.4;
 				OTHER_LDFLAGS = (
 					"$(OTHER_LDFLAGS)",
 					"-ObjC",

GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1320"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FD260F31FD00458007A511D"
+               BuildableName = "JME Remit.app"
+               BlueprintName = "GME Remit"
+               ReferencedContainer = "container:GME Remit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FD261071FD00458007A511D"
+               BuildableName = "GMERemittanceTests.xctest"
+               BlueprintName = "GMERemittanceTests"
+               ReferencedContainer = "container:GME Remit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FD261121FD00458007A511D"
+               BuildableName = "GMERemittanceUITests.xctest"
+               BlueprintName = "GMERemittanceUITests"
+               ReferencedContainer = "container:GME Remit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "739F8179234ADA75003ABCF3"
+               BuildableName = "SnapshotUITest.xctest"
+               BlueprintName = "SnapshotUITest"
+               ReferencedContainer = "container:GME Remit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FD260F31FD00458007A511D"
+            BuildableName = "JME Remit.app"
+            BlueprintName = "GME Remit"
+            ReferencedContainer = "container:GME Remit.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FD260F31FD00458007A511D"
+            BuildableName = "JME Remit.app"
+            BlueprintName = "GME Remit"
+            ReferencedContainer = "container:GME Remit.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift

@@ -419,9 +419,9 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface {
       selectedStateProvinceLinker.onNext(model)
       
       let count = model.districts?.count ?? 0
-      if count != 0 {
-        selectedBranchLinker.onNext(nil)
-      }
+//      if count != 0 {
+//        selectedBranchLinker.onNext(nil)
+//      }
       
       selectedDistrictLinker.onNext(nil)
     case .district:

GME Remit/Modules/SideMenu/SideMenu.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" 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="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <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"/>
@@ -275,6 +275,66 @@
                                                             <constraint firstAttribute="height" relation="lessThanOrEqual" constant="60" id="wlb-2h-JrJ"/>
                                                         </constraints>
                                                     </stackView>
+                                                    <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="r87-ZR-kW8" userLabel="AboutStackView">
+                                                        <rect key="frame" x="0.0" y="97.666666666666686" width="334" height="45"/>
+                                                        <subviews>
+                                                            <stackView opaque="NO" contentMode="scaleToFill" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="eb0-iA-ggl">
+                                                                <rect key="frame" x="0.0" y="0.0" width="334" height="45"/>
+                                                                <subviews>
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" translatesAutoresizingMaskIntoConstraints="NO" id="qNk-HI-5YN">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="15" height="45"/>
+                                                                        <subviews>
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KT6-aG-2eX">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="15" height="15"/>
+                                                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                                <nil key="textColor"/>
+                                                                                <nil key="highlightedColor"/>
+                                                                            </label>
+                                                                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="about_JME" translatesAutoresizingMaskIntoConstraints="NO" id="THK-UW-mNz">
+                                                                                <rect key="frame" x="0.0" y="15" width="15" height="15"/>
+                                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                <constraints>
+                                                                                    <constraint firstAttribute="height" constant="15" id="eRl-Jf-CBC"/>
+                                                                                    <constraint firstAttribute="width" constant="15" id="mtJ-mc-Fwp"/>
+                                                                                </constraints>
+                                                                            </imageView>
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZeM-2m-RVu">
+                                                                                <rect key="frame" x="0.0" y="30" width="15" height="15"/>
+                                                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                                <nil key="textColor"/>
+                                                                                <nil key="highlightedColor"/>
+                                                                            </label>
+                                                                        </subviews>
+                                                                        <constraints>
+                                                                            <constraint firstItem="ZeM-2m-RVu" firstAttribute="height" secondItem="KT6-aG-2eX" secondAttribute="height" id="fGZ-A4-e4z"/>
+                                                                        </constraints>
+                                                                    </stackView>
+                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lad-pn-wLS">
+                                                                        <rect key="frame" x="30" y="0.0" width="304" height="45"/>
+                                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
+                                                                        <state key="normal" title="ATM Bank Deposit">
+                                                                            <color key="titleColor" name="ThemeText"/>
+                                                                        </state>
+                                                                        <connections>
+                                                                            <action selector="atmButtonPressed:" destination="XQF-oH-rUR" eventType="touchUpInside" id="T6y-ul-RAy"/>
+                                                                        </connections>
+                                                                    </button>
+                                                                </subviews>
+                                                            </stackView>
+                                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RXu-Ug-UBy" userLabel="AboutGmeSeperator">
+                                                                <rect key="frame" x="0.0" y="0.0" width="334" height="0.33333333333333331"/>
+                                                                <color key="backgroundColor" name="ThemeSeparate"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="0.5" id="JIS-6i-Pyw"/>
+                                                                </constraints>
+                                                            </view>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" relation="lessThanOrEqual" constant="60" id="4bk-2w-7ST"/>
+                                                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="45" id="65A-uC-ZHI"/>
+                                                        </constraints>
+                                                    </stackView>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="4oZ-AQ-PlP" userLabel="SettingStack View">
                                                         <rect key="frame" x="0.0" y="100" width="334" height="45"/>
                                                         <subviews>
@@ -414,7 +474,9 @@
                     <connections>
                         <outlet property="aboutGmeButton" destination="g04-2C-I0o" id="KXW-AM-XiD"/>
                         <outlet property="aboutIconImageView" destination="2YN-i2-6yb" id="ZKX-fP-dfD"/>
+                        <outlet property="aboutJmeImageView" destination="THK-UW-mNz" id="vcl-kj-D4G"/>
                         <outlet property="accountStatementBtn" destination="jde-0G-gXq" id="j1R-8I-QXh"/>
+                        <outlet property="atmButton" destination="Lad-pn-wLS" id="Ttb-cN-ceH"/>
                         <outlet property="labelEmail" destination="SdX-nR-jpH" id="Vtd-9B-PVx"/>
                         <outlet property="labelPhone" destination="QNQ-s6-P5E" id="Xf6-UG-G5c"/>
                         <outlet property="labelProfileName" destination="kdg-zQ-NIN" id="Iqv-EW-sLk"/>

GME Remit/Modules/SideMenu/SideMenuViewController.swift

@@ -13,6 +13,7 @@ import Localize_Swift
 
 import RxSwift
 import RxCocoa
+import SafariServices
 
 protocol SideMenuDelegate: class {
     func didSelectMenu(_ viewController: UIViewController, didSelectMenu: SideMenuViewController.MenuType)
@@ -67,6 +68,10 @@ class SideMenuViewController: UIViewController {
     @IBOutlet weak var logoutIconImageView: UIImageView!
     @IBOutlet weak var noticeButton: UIButton!
     
+    @IBOutlet weak var atmButton: UIButton!
+    
+    @IBOutlet weak var aboutJmeImageView: UIImageView!
+    
     weak var sideMenuDelegate: SideMenuDelegate?
     
     private let disposeBag = DisposeBag()
@@ -158,10 +163,18 @@ class SideMenuViewController: UIViewController {
         self.sideMenuController?.hideLeftView()
         sideMenuDelegate?.didSelectMenu(self, didSelectMenu: .notice)
     }
+    
+    
+    @IBAction func atmButtonPressed(_ sender: Any) {
+        let urlString = "https://japanremit.com/document/Manual/JpPost.html"
+        showTutorial(url: urlString)
+    }
+    
     @IBAction func backButton(_ sender: UIButton) {
         self.sideMenuController?.hideLeftView(animated: true, completionHandler: nil)
     }
     
+    
     @IBAction func logout(_ sender: Any) {
         alertWithOkCancel(
             type: .normal,
@@ -204,4 +217,14 @@ class SideMenuViewController: UIViewController {
     func getWithdrawNotificationName() -> Notification.Name {
         return Notification.Name.init(SideMenuNavigationNotifications.withdraw)
     }
+    
+    func showTutorial(url: String) {
+        if let url = URL(string: url) {
+            let config = SFSafariViewController.Configuration()
+            config.entersReaderIfAvailable = false
+
+            let vc = SFSafariViewController(url: url, configuration: config)
+            present(vc, animated: true)
+        }
+    }
 }

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

@@ -1173,7 +1173,7 @@
 "hassle_free_transfer_text"="ঝামেলা মুক্ত আপনার প্রিয়জনের কাছে অর্থ স্থানান্তর";
 "connect_local_community_text"="স্থানীয় সম্প্রদায়ে সংযুক্ত";
 "earn_reward_point_text"="পুরষ্কার পয়েন্ট উপার্জন করুন এবং অবাক উপহার পাবেন";
-"new_user_text"="নতুন ব্যবহারকারী";
+"new_user_text"="নতুন রেজিসট্রেশন";
 "existing_jme_users_without_app_login"="অ্যাপ লগইন ছাড়াই বিদ্যমান জেএমই ব্যবহারকারীরা";
 
 

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

@@ -1,7 +1,7 @@
 
 "login_text" = "Login";
 "tap_to_login_using_finger_text" = "Tap to login with fingerprint";
-"new_user_text" = "New User";
+"new_user_text" = "New Registration";
 "hassle_free_transfer_text" = "Hassle free money transfer to your loved ones";
 "connect_local_community_text" = "Connect to local community";
 "earn_reward_point_text" = "Earn reward points and get surprise gifts";

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

@@ -1,7 +1,7 @@
 
 "login_text" = "ログイン";
 "tap_to_login_using_finger_text" = "指紋にてログインするためにタップしてください。";
-"new_user_text" = "新規ユーザー";
+"new_user_text" = "新規登録";
 "hassle_free_transfer_text" = "大切な人にお金を送る";
 "connect_local_community_text" = "地域社会とつながる";
 "earn_reward_point_text" = "ポイントを貯めて、サプライズギフトをもらいましょう";

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

@@ -1179,7 +1179,7 @@
 "hassle_free_transfer_text"="तपाईका प्रियजनहरूलाई परेशानीमुक्त पैसा स्थानान्तरण गर्नुहोस्";
 "connect_local_community_text"="स्थानीय समुदायमा जडान गर्नुहोस्";
 "earn_reward_point_text"="इनाम अंकहरू कमाउनुहोस् र अचम्मका उपहारहरू पाउनुहोस्";
-"new_user_text"="नयाँ प्रयोगकर्ता";
+"new_user_text"="नयाँ दर्ता";
 "existing_jme_users_without_app_login"="अनुप्रयोग लगइन बिना JME प्रयोगकर्ता अवस्थित छ";
 
 

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

@@ -459,7 +459,7 @@
 "change_later_text" = "ඔබට පසුව ඔබේ කැමැත්ත වෙනස් කළ හැක";
 
 // Splash Screen
-"new_user_text" = "නව පරිශීලකයෙක්";
+"new_user_text" = "නව ලියාපදිංචිවීම";
 "existing_jme_users_without_app_login" = "ඇප් එකට ලොගින් නොවී සිටින JME පරිශීලකයින්";
 "earn_reward_point_text" = "ප්‍රසාද ලකුණු උපයන්න සහ අනපේක්ෂිත තෑගි ලබා ගන්න";
 "connect_local_community_text" = "ප්‍රාදේශීය ප්‍රජාවට සම්බන්ධ වන්න";

GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings

@@ -1174,7 +1174,7 @@ Chúng tôi đang xác minh thông tin của bạn.";
 "hassle_free_transfer_text"="Chuyển tiền cho những người yêu thương của bạn";
 "connect_local_community_text"="Kết nối đến cộng đồng địa phương";
 "earn_reward_point_text"="Kiếm điểm thưởng và giành quà bất ngờ";
-"new_user_text"="Người dùng mới";
+"new_user_text"="Đăng kí mới";
 "existing_jme_users_without_app_login"="Người dùng JME hiện tại không đăng nhập ứng dụng";