bug fixed

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",

neowallet_mobile/assets/translations/th.json

@@ -32,8 +32,10 @@
   "Mrs.":"นาง",
   "Miss":"นางสาว",
   "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":"ชื่อ-นามสกุล ภาษาไทย",
+  "English name_passport":"ชื่อ-นามสกุล ภาษาอังกฤษ",
   "nationality":"สัญชาติ",
   "Date of birth":"วันเดือนปีเกิด",
   "Mobilephone number":"เบอร์โทรศัพท์",

neowallet_mobile/lib/Home/ChangePassword.dart

@@ -91,6 +91,10 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
           leading: CupertinoButton(
             onPressed: () {
               Navigator.pop(context);
+              _current_pass.text = "";
+              _new_pass.text = "";
+              _confirm_pass.text="";
+
             },
             child: const Icon(
               Icons.arrow_back,

neowallet_mobile/lib/Login/forgot_password.dart

@@ -35,6 +35,8 @@ class _LoginValidateState extends State<ForgotPassword> {
     } else if (Platform.isIOS) {
       iosDeviceInfo = await device.iosInfo;
     }
+    email.text ="";
+    phone.text="";
   }
 
   authen(BuildContext context) {

neowallet_mobile/lib/Pay/PayPromptPay.dart

@@ -173,7 +173,7 @@ class _TransferPromptPayDetailState extends State<TransferPromptPayDetail> {
     // var param = jsonEncode(<dynamic, dynamic>{"IDCardOrMobileDeviceNo": widget.phone, "Amount": priceTemp});
 
     var param = jsonEncode(
-        <dynamic, dynamic>{"requestTransactionID": Utils.getDateInitPromptPay() + widget.phone.lastChars(4), "iDCardorMobileNo": widget.phone, "amount": "${priceTemp}00"});
+        <dynamic, dynamic>{"requestTransactionID": Utils.getDateInitPromptPay() + widget.phone.lastChars(4), "iDCardorMobileNo": widget.phone, "amount": "${(double.parse(priceTemp).toStringAsFixed(2)).replaceAll(".", "")}"});
     Api.post(context, Api.payPromptPayInitial, param).then((value) => {
           if (value != null)
             {

neowallet_mobile/lib/Pay/PayQrDialogV2.dart

@@ -108,7 +108,7 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
                   ),
                 ),
                 Text(
-                  "จำนวนเงิน/Amount ฿" + widget.price,
+                  "จำนวนเงิน/Amount ฿" +  widget.price,
                   style: TextStyle(
                     color: Color(0xff65676b),
                     fontSize: 16,

neowallet_mobile/lib/Register/register_data.dart

@@ -335,7 +335,7 @@ class _RegisterDataState extends State<RegisterData> {
                 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,
@@ -388,35 +388,37 @@ class _RegisterDataState extends State<RegisterData> {
                   color: Color(0xfff3f3f3),
                 ),
               ),
-              Row(
+              Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  Text(
+                  Row(
-                    "English name".tr(),
+                    children: [
+                      Text(
+                        isPassport? "English name_passport".tr():  "English name".tr(),
+                        style: GoogleFonts.kanit(
+                          color: Color(0xff565656),
+                          fontSize: 15,
+                        ),
+                      ),Spacer()
+                    ],
+                  ),
+                  TextField(
                     style: GoogleFonts.kanit(
                       color: Color(0xff565656),
-                      fontSize: 15,
+                      fontSize: 14,
                     ),
-                  ),
+                    inputFormatters: <TextInputFormatter>[FilteringTextInputFormatter.allow(RegExp('[a-z A-Z]'))],
-                  Expanded(
+                    keyboardType: TextInputType.text,
-                    child: TextField(
+                    textAlign: TextAlign.right,
-                      style: GoogleFonts.kanit(
+                    controller: nameEnEditText,
-                        color: Color(0xff565656),
+                    decoration: InputDecoration(
-                        fontSize: 14,
+                      hintText: '',
-                      ),
+                      suffixIcon: Icon(
-                      inputFormatters: <TextInputFormatter>[FilteringTextInputFormatter.allow(RegExp('[a-z A-Z]'))],
+                        Icons.arrow_forward_ios_rounded,
-                      keyboardType: TextInputType.text,
+                        size: 15,
-                      textAlign: TextAlign.right,
+                        color: Colors.grey,
-                      controller: nameEnEditText,
-                      decoration: InputDecoration(
-                        hintText: '',
-                        suffixIcon: Icon(
-                          Icons.arrow_forward_ios_rounded,
-                          size: 15,
-                          color: Colors.grey,
-                        ),
-                        border: InputBorder.none,
                       ),
+                      border: InputBorder.none,
                     ),
                   ),
                   // Expanded(

neowallet_mobile/lib/Register/register_signature.dart

@@ -112,6 +112,8 @@ class _RegisterSignaturePageState extends State<RegisterSignaturePage> {
       "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<RegisterSignaturePage> {
           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, '/');
           })
         }

neowallet_mobile/lib/TopUp/topup_amout.dart

@@ -51,7 +51,7 @@ class _TransferPromptPayDetailState extends State<TopUpAmountPage> {
     });
     var param = jsonEncode(<dynamic, dynamic>{
       "merchantLocalID": Api.merchantId,
-      "amount": "${number}00",
+      "amount": "${(double.parse(number).toStringAsFixed(2)).replaceAll(".", "")}}",
       "invoice": "INV${Utils.getTimestamp()}",
       "ref1": "REF${Utils.getTimestamp()}01",
       "ref2": "REF${Utils.getTimestamp()}02",

neowallet_mobile/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.4+4
+version: 1.0.4+5
 
 environment:
   sdk: '>=2.19.3 <3.0.0'