IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'ocrLive' into external/dev

v0.17
shakun 1 year ago
parent
807cfc0012 286e873e47
commit
d06e3c2b59
8 changed files with 24 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      GME Remit.xcodeproj/project.pbxproj
  2. 8
      GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
  3. 18
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard
  4. 1
      GME Remit/MultiLanguages/bn.lproj/Localizable.strings
  5. 1
      GME Remit/MultiLanguages/ja.lproj/Localizable.strings
  6. 1
      GME Remit/MultiLanguages/ne.lproj/Localizable.strings
  7. 1
      GME Remit/MultiLanguages/si.lproj/Localizable.strings
  8. 1
      GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings

4
GME Remit.xcodeproj/project.pbxproj
View File

@ -8303,7 +8303,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
);
MARKETING_VERSION = 1.5.5;
MARKETING_VERSION = 1.5.7;
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
@ -8348,7 +8348,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
);
MARKETING_VERSION = 1.5.5;
MARKETING_VERSION = 1.5.7;
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
"-ObjC",

8
GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
View File

@ -446,6 +446,7 @@ extension HomeViewController {
messageTitleLabel.text = "Change Password"
messageLabel.text = "Please change your password"
messageLeftImageview.image = UIImage(named: "Documents")
messageView.isUserInteractionEnabled = true
let tap = UITapGestureRecognizer(target: self, action: #selector(self.changePassword(_:)))
messageView.addGestureRecognizer(tap)
}
@ -457,6 +458,7 @@ extension HomeViewController {
messageTitleLabel.text = "change_txn_pin".localized()
messageLabel.text = "change_txn_pin_detail".localized()
messageLeftImageview.image = UIImage(named: "Documents")
messageView.isUserInteractionEnabled = true
let tap = UITapGestureRecognizer(target: self, action: #selector(self.changetxnPin(_:)))
messageView.addGestureRecognizer(tap)
}
@ -468,6 +470,7 @@ extension HomeViewController {
messageTitleLabel.text = "setup_new_pin_title".localized()
messageLabel.text = "setup_new_pin_body".localized()
messageLeftImageview.image = UIImage(named: "Documents")
messageView.isUserInteractionEnabled = true
let tap = UITapGestureRecognizer(target: self, action: #selector(self.setupTxnPin(_:)))
messageView.addGestureRecognizer(tap)
}
@ -479,6 +482,7 @@ extension HomeViewController {
messageTitleLabel.text = "change_txn_pin_n_pass".localized()
messageLabel.text = "change_txn_pin_n_pass_detail".localized()
messageLeftImageview.image = UIImage(named: "Documents")
messageView.isUserInteractionEnabled = true
let tap = UITapGestureRecognizer(target: self, action: #selector(changePinAndPassword(_:)))
messageView.addGestureRecognizer(tap)
}
@ -491,12 +495,14 @@ extension HomeViewController {
messageLabel.text = StringConstants().soonToUseGmeServicesTitle
messageLeftImageview.image = UIImage(named: "Documents")
if user?.agreeYn?.lowercased() == "false" {
messageView.isUserInteractionEnabled = true
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 3) {
let w = NewRegisterWireframe.init()
w.isFrom = true
w.open(on: self, step: .terms)
}
}
messageView.isUserInteractionEnabled = false
}
private func showKycIncompleteMessage() {
@ -506,6 +512,7 @@ extension HomeViewController {
messageTitleLabel.text = "kyc_fill_text".localized()
messageLabel.text = "complete_your_registration_text".localized()
messageLeftImageview.image = UIImage(named: "Documents")
messageView.isUserInteractionEnabled = true
let tap = UITapGestureRecognizer(target: self, action: #selector(self.handleTap(_:)))
messageView.addGestureRecognizer(tap)
}
@ -517,6 +524,7 @@ extension HomeViewController {
messageTitleLabel.text = "Verify email"
messageLabel.text = "Please click here to verify your email address"
messageLeftImageview.image = UIImage(named: "Documents")
messageView.isUserInteractionEnabled = true
let tap = UITapGestureRecognizer(target: self, action: #selector(otpVerificationTapped(_:)))
messageView.addGestureRecognizer(tap)
}

18
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard
View File

@ -33,16 +33,16 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="2500"/>
<subviews>
<view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="594.5" translatesAutoresizingMaskIntoConstraints="NO" id="h62-Bc-pZz">
<rect key="frame" x="0.0" y="0.0" width="375" height="2258"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="2372"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1BC-po-v3w">
<rect key="frame" x="0.0" y="0.0" width="375" height="2258"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="2372"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="ztF-Hd-9ij">
<rect key="frame" x="20" y="20" width="335" height="2218"/>
<rect key="frame" x="20" y="20" width="335" height="2332"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="KOC-Gh-ufv">
<rect key="frame" x="0.0" y="0.0" width="335" height="765"/>
<rect key="frame" x="0.0" y="0.0" width="335" height="879"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="cDv-xz-NaI">
<rect key="frame" x="0.0" y="0.0" width="335" height="25"/>
@ -306,8 +306,8 @@
</textField>
</subviews>
</stackView>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wAi-G0-dKu">
<rect key="frame" x="0.0" y="700" width="335" height="0.0"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wAi-G0-dKu">
<rect key="frame" x="0.0" y="715" width="335" height="84"/>
<string key="text">Name, Nationality, Address and Sex are stated in the personal identification document submitted here. 名前、国籍、住所、誕生日、性別等の項目は確認書類記載内容の通りです。
</string>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
@ -315,7 +315,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IcD-pK-L7f">
<rect key="frame" x="0.0" y="715" width="335" height="50"/>
<rect key="frame" x="0.0" y="829" width="335" height="50"/>
<color key="backgroundColor" name="ThemeRed"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="xYG-Pj-I7Y"/>
@ -328,7 +328,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="JKV-BI-zAm">
<rect key="frame" x="0.0" y="770" width="335" height="835"/>
<rect key="frame" x="0.0" y="884" width="335" height="835"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="i7W-0A-Wvh">
<rect key="frame" x="0.0" y="0.0" width="335" height="25"/>
@ -1010,7 +1010,7 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sRy-AC-Qee">
<rect key="frame" x="0.0" y="1610" width="335" height="608"/>
<rect key="frame" x="0.0" y="1724" width="335" height="608"/>
<subviews>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0fZ-XA-Bzr">
<rect key="frame" x="0.0" y="538" width="335" height="50"/>

1
GME Remit/MultiLanguages/bn.lproj/Localizable.strings
View File

@ -1417,3 +1417,4 @@
"setup_new_pin_title" = "লেনদেন পিন সেটআপ করুন";
"setup_new_pin_body" = "নতুন লেনদেন পিন সেটআপ করতে এখানে ক্লিক করুন";
"how_to_deposit_text" = "ডিপোজিট কিভাবে করবেন";

1
GME Remit/MultiLanguages/ja.lproj/Localizable.strings
View File

@ -999,3 +999,4 @@
"setup_new_pin_title" = "取引暗証番号の設定";
"setup_new_pin_body" = "新しいトランザクション PIN を設定するには、ここをクリックしてください";
"how_to_deposit_text" = "入金方法";

1
GME Remit/MultiLanguages/ne.lproj/Localizable.strings
View File

@ -1430,3 +1430,4 @@
"setup_new_pin_title" = "PIN सेटअप गर्नुहोस्";
"setup_new_pin_body" = "कृपया नयाँ पिन सेटअप गर्न यहाँ क्लिक गर्नुहोस्";
"how_to_deposit_text" = "डिपोजिट गर्ने तरिका";

1
GME Remit/MultiLanguages/si.lproj/Localizable.strings
View File

@ -671,3 +671,4 @@
"setup_new_pin_title" = "ගනුදෙනු PIN සකසන්න";
"setup_new_pin_body" = "කරුණාකර නව ගනුදෙනු පින් පිහිටුවීමට මෙතන ක්ලික් කරන්න";
"how_to_deposit_text" = "තැන්පත් කරන්නේ කෙසේද";

1
GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings
View File

@ -1424,3 +1424,4 @@ Chúng tôi đang xác minh thông tin của bạn.";
"setup_new_pin_title" = "Thiết lập mã PIN giao dịch";
"setup_new_pin_body" = "Vui lòng nhấp vào đây để thiết lập Pin giao dịch mới";
"how_to_deposit_text" = "Làm thế nào để gửi tiền";
Write Preview
Loading…
Cancel
Save