manasit/Neo_wallet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: manasit:4797a476ebaa44df1f055dec1ac90ca04df91270
Branches Tags
manasit:main
...
compare: manasit:62c7cc21798807c377ee38560cdd144baef6b469
Branches Tags
manasit:main

3 Commits
4797a476eb ... 62c7cc2179

Author SHA1 Message Date
nutchayut
62c7cc2179 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/.filecache
#	neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/app.dill
#	neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/debug_ios_bundle_flutter_assets.stamp
#	neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/flutter_assets.d
#	neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/kernel_snapshot_program.d
#	neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/kernel_snapshot_program.stamp
#	neowallet_mobile/.dart_tool/flutter_build/0f1c8bb9795d8001a30794af192ea11b/program.dill
#	neowallet_mobile/build/f872507f30e2ff2523f0f1d19160266e.cache.dill.track.dill
#	neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/App
#	neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources
#	neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/assets/translations/en.json
#	neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/assets/translations/th.json
#	neowallet_mobile/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin
#	neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App
#	neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
#	neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/assets/translations/en.json
#	neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/assets/translations/th.json
#	neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
#	neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/Runner
#	neowallet_mobile/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources
#	neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App
#	neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
#	neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/assets/translations/en.json
#	neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/assets/translations/th.json
#	neowallet_mobile/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
#	neowallet_mobile/build/ios/iphonesimulator/Runner.app/Runner
#	neowallet_mobile/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources
 2025-01-09 10:27:51 +07:00
nutchayut
c69f7651d8 bug fixed 2025-01-09 10:24:57 +07:00
nutchayut
e2fb044931 bug fixed 2025-01-09 10:24:14 +07:00
4 changed files with 6 additions and 4 deletions
Expand all files Collapse all files

2
neowallet_mobile/.flutter-plugins-dependencies
View File

File diff suppressed because one or more lines are too long

2
neowallet_mobile/lib/Pay/PayQrDialogV2.dart
View File

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

4
neowallet_mobile/lib/TransferMoney/transfer_history.dart
View File

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

2
neowallet_mobile/pubspec.yaml
View File

@@ -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 # 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 # 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. # 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: environment:
sdk: '>=2.19.3 <3.0.0' sdk: '>=2.19.3 <3.0.0'