bug fixed

neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources

@@ -26,11 +26,11 @@
 		</data>
 		<key>flutter_assets/assets/translations/en.json</key>
 		<data>
-		TAIvrHMgm8A1PYRAI0u/zPiikp8=
+		/gnm3BYXfKLULJeVjEhFHi70t8U=
 		</data>
 		<key>flutter_assets/assets/translations/th.json</key>
 		<data>
-		Oh4k3E6ouKtkPc6C08PJEc1N3YY=
+		5U/Q7Je8oblr4aVz7ZB3gbPYtgs=
 		</data>
 		<key>flutter_assets/fonts/MaterialIcons-Regular.otf</key>
 		<data>
@@ -326,7 +326,7 @@
 		</data>
 		<key>flutter_assets/kernel_blob.bin</key>
 		<data>
-		gbkSfdY/mq1tEx+4Z/WDiq6byvo=
+		LzarC1lON3rCzknNa2ZSgFtoC80=
 		</data>
 		<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
 		<data>
@@ -387,14 +387,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			siIZcQl0Pk0BIuvSUOtZF7eT4ws61+5OkdDb1F3V4cU=
+			of/n7kRV/gfz0Fba8xQAoKFl0SEsddTH30ur7nShEZ8=
 			</data>
 		</dict>
 		<key>flutter_assets/assets/translations/th.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qN5idl32WS9usLUdF7R7sBVfoso6pMwohjc7SidKAKs=
+			hMnbf7P91MkQd4yObDIMBcauNbHaBXPhMgeNVH0KjsQ=
 			</data>
 		</dict>
 		<key>flutter_assets/fonts/MaterialIcons-Regular.otf</key>
@@ -912,7 +912,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
+			eo5+/beN0MvBKJfBOPJ+w7rGm2kiyv969xikk7jkG2M=
 			</data>
 		</dict>
 		<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>

neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources

@@ -26,11 +26,11 @@
 		</data>
 		<key>flutter_assets/assets/translations/en.json</key>
 		<data>
-		TAIvrHMgm8A1PYRAI0u/zPiikp8=
+		/gnm3BYXfKLULJeVjEhFHi70t8U=
 		</data>
 		<key>flutter_assets/assets/translations/th.json</key>
 		<data>
-		Oh4k3E6ouKtkPc6C08PJEc1N3YY=
+		5U/Q7Je8oblr4aVz7ZB3gbPYtgs=
 		</data>
 		<key>flutter_assets/fonts/MaterialIcons-Regular.otf</key>
 		<data>
@@ -326,7 +326,7 @@
 		</data>
 		<key>flutter_assets/kernel_blob.bin</key>
 		<data>
-		gbkSfdY/mq1tEx+4Z/WDiq6byvo=
+		LzarC1lON3rCzknNa2ZSgFtoC80=
 		</data>
 		<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
 		<data>
@@ -387,14 +387,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			siIZcQl0Pk0BIuvSUOtZF7eT4ws61+5OkdDb1F3V4cU=
+			of/n7kRV/gfz0Fba8xQAoKFl0SEsddTH30ur7nShEZ8=
 			</data>
 		</dict>
 		<key>flutter_assets/assets/translations/th.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qN5idl32WS9usLUdF7R7sBVfoso6pMwohjc7SidKAKs=
+			hMnbf7P91MkQd4yObDIMBcauNbHaBXPhMgeNVH0KjsQ=
 			</data>
 		</dict>
 		<key>flutter_assets/fonts/MaterialIcons-Regular.otf</key>
@@ -912,7 +912,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
+			eo5+/beN0MvBKJfBOPJ+w7rGm2kiyv969xikk7jkG2M=
 			</data>
 		</dict>
 		<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>

neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/assets/translations/en.json

@@ -147,5 +147,6 @@
   "อีเมลใหม่":"New Email",
   "รหัสผ่านปัจจุบัน":"Current Password",
   "รหัสผ่านใหม่":"New Password",
-  "กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password"
+  "กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password",
+  "บันทึกและปิด":"Save and Close"
 }

neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/assets/translations/th.json

@@ -147,6 +147,6 @@
   "อีเมลใหม่":"อีเมลใหม่",
   "รหัสผ่านปัจจุบัน":"รหัสผ่านปัจจุบัน",
   "รหัสผ่านใหม่":"รหัสผ่านใหม่",
-  "กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง"
+  "กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง",
-
+  "บันทึกและปิด":"บันทึกและปิด"
 }

neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources

@@ -46,7 +46,7 @@
 		</data>
 		<key>Frameworks/App.framework/App</key>
 		<data>
-		kfxA9GQZWI6PVakbrvb7sQ5CNAw=
+		DP5jdN+Pf9u+ci6RXCoipW9hl48=
 		</data>
 		<key>Frameworks/App.framework/Info.plist</key>
 		<data>
@@ -54,7 +54,7 @@
 		</data>
 		<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
 		<data>
-		tAKFo7k6LHtXeyBw5m2XQyIIv5M=
+		+OjDL71AVX3JYBteFUR94UZBOmY=
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
 		<data>
@@ -74,11 +74,11 @@
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/assets/translations/en.json</key>
 		<data>
-		TAIvrHMgm8A1PYRAI0u/zPiikp8=
+		/gnm3BYXfKLULJeVjEhFHi70t8U=
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/assets/translations/th.json</key>
 		<data>
-		Oh4k3E6ouKtkPc6C08PJEc1N3YY=
+		5U/Q7Je8oblr4aVz7ZB3gbPYtgs=
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/fonts/MaterialIcons-Regular.otf</key>
 		<data>
@@ -374,7 +374,7 @@
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
 		<data>
-		gbkSfdY/mq1tEx+4Z/WDiq6byvo=
+		LzarC1lON3rCzknNa2ZSgFtoC80=
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
 		<data>
@@ -789,7 +789,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			dFnsaN4g1KfVaFqhTb5SnE+Es/XRYVP7ANGrWLHBb88=
+			6wpT93v18+0Uek4+jSZTC11XbYfOsHnBMXpnjgZooOk=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/Info.plist</key>
@@ -803,7 +803,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			FEwEmnZzQ/t/bjtSaArEqhKt+/b2XmzBl/nj/iokPjU=
+			VY8gn1Ko9kpRX+XIwWVgooMDevjP2a1G5hgkaq3+GZo=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
@@ -838,14 +838,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			siIZcQl0Pk0BIuvSUOtZF7eT4ws61+5OkdDb1F3V4cU=
+			of/n7kRV/gfz0Fba8xQAoKFl0SEsddTH30ur7nShEZ8=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/flutter_assets/assets/translations/th.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qN5idl32WS9usLUdF7R7sBVfoso6pMwohjc7SidKAKs=
+			hMnbf7P91MkQd4yObDIMBcauNbHaBXPhMgeNVH0KjsQ=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/flutter_assets/fonts/MaterialIcons-Regular.otf</key>
@@ -1363,7 +1363,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
+			eo5+/beN0MvBKJfBOPJ+w7rGm2kiyv969xikk7jkG2M=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>

neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources

@@ -26,11 +26,11 @@
 		</data>
 		<key>flutter_assets/assets/translations/en.json</key>
 		<data>
-		TAIvrHMgm8A1PYRAI0u/zPiikp8=
+		/gnm3BYXfKLULJeVjEhFHi70t8U=
 		</data>
 		<key>flutter_assets/assets/translations/th.json</key>
 		<data>
-		Oh4k3E6ouKtkPc6C08PJEc1N3YY=
+		5U/Q7Je8oblr4aVz7ZB3gbPYtgs=
 		</data>
 		<key>flutter_assets/fonts/MaterialIcons-Regular.otf</key>
 		<data>
@@ -326,7 +326,7 @@
 		</data>
 		<key>flutter_assets/kernel_blob.bin</key>
 		<data>
-		gbkSfdY/mq1tEx+4Z/WDiq6byvo=
+		LzarC1lON3rCzknNa2ZSgFtoC80=
 		</data>
 		<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
 		<data>
@@ -387,14 +387,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			siIZcQl0Pk0BIuvSUOtZF7eT4ws61+5OkdDb1F3V4cU=
+			of/n7kRV/gfz0Fba8xQAoKFl0SEsddTH30ur7nShEZ8=
 			</data>
 		</dict>
 		<key>flutter_assets/assets/translations/th.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qN5idl32WS9usLUdF7R7sBVfoso6pMwohjc7SidKAKs=
+			hMnbf7P91MkQd4yObDIMBcauNbHaBXPhMgeNVH0KjsQ=
 			</data>
 		</dict>
 		<key>flutter_assets/fonts/MaterialIcons-Regular.otf</key>
@@ -912,7 +912,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
+			eo5+/beN0MvBKJfBOPJ+w7rGm2kiyv969xikk7jkG2M=
 			</data>
 		</dict>
 		<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>

neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/assets/translations/en.json

@@ -147,5 +147,6 @@
   "อีเมลใหม่":"New Email",
   "รหัสผ่านปัจจุบัน":"Current Password",
   "รหัสผ่านใหม่":"New Password",
-  "กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password"
+  "กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password",
+  "บันทึกและปิด":"Save and Close"
 }

neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/assets/translations/th.json

@@ -147,6 +147,6 @@
   "อีเมลใหม่":"อีเมลใหม่",
   "รหัสผ่านปัจจุบัน":"รหัสผ่านปัจจุบัน",
   "รหัสผ่านใหม่":"รหัสผ่านใหม่",
-  "กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง"
+  "กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง",
-
+  "บันทึกและปิด":"บันทึกและปิด"
 }

neowallet_mobile/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources

@@ -46,7 +46,7 @@
 		</data>
 		<key>Frameworks/App.framework/App</key>
 		<data>
-		kfxA9GQZWI6PVakbrvb7sQ5CNAw=
+		DP5jdN+Pf9u+ci6RXCoipW9hl48=
 		</data>
 		<key>Frameworks/App.framework/Info.plist</key>
 		<data>
@@ -54,7 +54,7 @@
 		</data>
 		<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
 		<data>
-		tAKFo7k6LHtXeyBw5m2XQyIIv5M=
+		+OjDL71AVX3JYBteFUR94UZBOmY=
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
 		<data>
@@ -74,11 +74,11 @@
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/assets/translations/en.json</key>
 		<data>
-		TAIvrHMgm8A1PYRAI0u/zPiikp8=
+		/gnm3BYXfKLULJeVjEhFHi70t8U=
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/assets/translations/th.json</key>
 		<data>
-		Oh4k3E6ouKtkPc6C08PJEc1N3YY=
+		5U/Q7Je8oblr4aVz7ZB3gbPYtgs=
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/fonts/MaterialIcons-Regular.otf</key>
 		<data>
@@ -374,7 +374,7 @@
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
 		<data>
-		gbkSfdY/mq1tEx+4Z/WDiq6byvo=
+		LzarC1lON3rCzknNa2ZSgFtoC80=
 		</data>
 		<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
 		<data>
@@ -789,7 +789,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			dFnsaN4g1KfVaFqhTb5SnE+Es/XRYVP7ANGrWLHBb88=
+			6wpT93v18+0Uek4+jSZTC11XbYfOsHnBMXpnjgZooOk=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/Info.plist</key>
@@ -803,7 +803,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			FEwEmnZzQ/t/bjtSaArEqhKt+/b2XmzBl/nj/iokPjU=
+			VY8gn1Ko9kpRX+XIwWVgooMDevjP2a1G5hgkaq3+GZo=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/flutter_assets/AssetManifest.bin</key>
@@ -838,14 +838,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			siIZcQl0Pk0BIuvSUOtZF7eT4ws61+5OkdDb1F3V4cU=
+			of/n7kRV/gfz0Fba8xQAoKFl0SEsddTH30ur7nShEZ8=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/flutter_assets/assets/translations/th.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qN5idl32WS9usLUdF7R7sBVfoso6pMwohjc7SidKAKs=
+			hMnbf7P91MkQd4yObDIMBcauNbHaBXPhMgeNVH0KjsQ=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/flutter_assets/fonts/MaterialIcons-Regular.otf</key>
@@ -1363,7 +1363,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			T4pkWKTqg7nWOhwuoRIdWB0t8KdXBJ3njnMRj5/D3c0=
+			eo5+/beN0MvBKJfBOPJ+w7rGm2kiyv969xikk7jkG2M=
 			</data>
 		</dict>
 		<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>

neowallet_mobile/lib/Pay/PayQrDialogV2.dart

@@ -399,6 +399,8 @@ class _PayQrDialogV2State extends State<PayQrDialogV2> {
                     }).catchError((onError) {
                       print(onError);
                     });
+                    Navigator.popUntil(
+                        context, ModalRoute.withName('/HomePage'));
                   },
                   child: Container(
                     margin: EdgeInsets.only(top: 20, bottom: 20),

neowallet_mobile/lib/TransferMoney/transfer_history.dart

@@ -29,7 +29,7 @@ class _TopUpHistoryState extends State<TransferHistory> {
 
     var param = jsonEncode(<dynamic, dynamic>{
       "id": "",
-      "requestUserID": profile!.id,
+      "requestUserID":"",
       "invoiceId": "",
       "referencE1": "",
       "referencE2": "",
@@ -146,7 +146,7 @@ class _TopUpHistoryState extends State<TransferHistory> {
                             ),
                           ),
                           Text(
-                            "From ${transactions.phoneNumber}" ?? "",
+                            "From ${transactions.payerName}" ?? "",
                             style: TextStyle(
                               color: Color(0xff65676b),
                               fontSize: 16,

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+1
+version: 1.0.4+2
 
 environment:
   sdk: '>=2.19.3 <3.0.0'