diff --git a/neowallet_mobile/assets/translations/en.json b/neowallet_mobile/assets/translations/en.json index 28e31478..00738f9e 100644 --- a/neowallet_mobile/assets/translations/en.json +++ b/neowallet_mobile/assets/translations/en.json @@ -34,6 +34,8 @@ "Not specified":"Not specified", "Thai name/english name in passport":"Thai name/english name in passport", "English name":"English name", + "Thai name/english name in passport_passport":"First name - last name, local language as per passport", + "English name_passport":"First name - last name in English", "nationality":"nationality", "Date of birth":"Date of birth", "Mobilephone number":"Mobilephone number", diff --git a/neowallet_mobile/assets/translations/th.json b/neowallet_mobile/assets/translations/th.json index f9227e6b..63eda7a1 100644 --- a/neowallet_mobile/assets/translations/th.json +++ b/neowallet_mobile/assets/translations/th.json @@ -34,6 +34,8 @@ "Not specified":"ไม่ระบุ", "Thai name/english name in passport":"ชื่อภาษาไทย", "English name":"ชื่อภาษาอังกฤษ", + "Thai name/english name in passport_passport":"ชื่อภาษาไทย", + "English name_passport":"ชื่อภาษาอังกฤษ", "nationality":"สัญชาติ", "Date of birth":"วันเดือนปีเกิด", "Mobilephone number":"เบอร์โทรศัพท์", diff --git a/neowallet_mobile/lib/Home/ChangePassword.dart b/neowallet_mobile/lib/Home/ChangePassword.dart index 74868009..4b25e293 100644 --- a/neowallet_mobile/lib/Home/ChangePassword.dart +++ b/neowallet_mobile/lib/Home/ChangePassword.dart @@ -91,6 +91,10 @@ class _ChangePasswordPageState extends State { leading: CupertinoButton( onPressed: () { Navigator.pop(context); + _current_pass.text = ""; + _new_pass.text = ""; + _confirm_pass.text=""; + }, child: const Icon( Icons.arrow_back, diff --git a/neowallet_mobile/lib/Login/forgot_password.dart b/neowallet_mobile/lib/Login/forgot_password.dart index eed17742..ebb22295 100644 --- a/neowallet_mobile/lib/Login/forgot_password.dart +++ b/neowallet_mobile/lib/Login/forgot_password.dart @@ -35,6 +35,8 @@ class _LoginValidateState extends State { } else if (Platform.isIOS) { iosDeviceInfo = await device.iosInfo; } + email.text =""; + phone.text=""; } authen(BuildContext context) { diff --git a/neowallet_mobile/lib/Pay/PayQrDialogV2.dart b/neowallet_mobile/lib/Pay/PayQrDialogV2.dart index b8fee65d..00fb8334 100644 --- a/neowallet_mobile/lib/Pay/PayQrDialogV2.dart +++ b/neowallet_mobile/lib/Pay/PayQrDialogV2.dart @@ -108,7 +108,7 @@ class _PayQrDialogV2State extends State { ), ), Text( - "จำนวนเงิน/Amount ฿" + widget.price, + "จำนวนเงิน/Amount ฿" + widget.price, style: TextStyle( color: Color(0xff65676b), fontSize: 16, diff --git a/neowallet_mobile/lib/Register/register_data.dart b/neowallet_mobile/lib/Register/register_data.dart index c8b5f13c..64f0bcb4 100644 --- a/neowallet_mobile/lib/Register/register_data.dart +++ b/neowallet_mobile/lib/Register/register_data.dart @@ -335,7 +335,7 @@ class _RegisterDataState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - "Thai name/english name in passport".tr(), + isPassport?"Thai name/english name in passport_passport".tr(): "Thai name/english name in passport".tr(), style: GoogleFonts.kanit( color: Color(0xff565656), fontSize: 15, @@ -392,7 +392,7 @@ class _RegisterDataState extends State { mainAxisSize: MainAxisSize.min, children: [ Text( - "English name".tr(), + isPassport? "English name_passport".tr(): "English name".tr(), style: GoogleFonts.kanit( color: Color(0xff565656), fontSize: 15, diff --git a/neowallet_mobile/lib/Register/register_signature.dart b/neowallet_mobile/lib/Register/register_signature.dart index fc51db35..2db63720 100644 --- a/neowallet_mobile/lib/Register/register_signature.dart +++ b/neowallet_mobile/lib/Register/register_signature.dart @@ -112,6 +112,8 @@ class _RegisterSignaturePageState extends State { "work_address": addressJob2.text, "image_person_with_card_url": imageEkycPath, "signature_url": signaturePath, + "user_name": username.text, + "purpose": target, }); Api.post(context, Api.ekyc, param).then((value) => { @@ -120,7 +122,7 @@ class _RegisterSignaturePageState extends State { setState(() { loading = false; }), - Utils.showAlertDialogCallback(context, "กรุณาเช็ก e-mail เพื่อยืนยัน\nPlease check you e-mail and confirm", (value) { + Utils.showAlertDialogCallback(context, "กรุณาเช็ค e-mail เพื่อยืนยัน และรอการตรวจสอบข้อมูลยืนยันตัวตนภายใน 48 ชั่วโมง\nPlease check your email to confirm and wait for verification of your identity within 48 hours", (value) { Navigator.pushNamed(context, '/'); }) }