From 27ac6f1f9977f90ec029889ddc76f53e2b10f06d Mon Sep 17 00:00:00 2001 From: Saman Waqar Date: Wed, 1 Apr 2026 15:05:20 +0500 Subject: [PATCH] code push --- lib/app/core/constants/app_assets.dart | 2 +- lib/app/models/resend_otp_usend.dart | 7 ++++- .../controllers/add_money_otp_controller.dart | 3 +- .../add_money/views/add_money_view.dart | 29 +++++++++---------- .../dashboard/views/shared/drawer_data.dart | 27 +++++++++-------- 5 files changed, 37 insertions(+), 31 deletions(-) diff --git a/lib/app/core/constants/app_assets.dart b/lib/app/core/constants/app_assets.dart index e3ac247..f330c86 100644 --- a/lib/app/core/constants/app_assets.dart +++ b/lib/app/core/constants/app_assets.dart @@ -100,7 +100,7 @@ class AppAssets { static const personalDetails = "assets/$ORGANIZATION/icons/personal_details.svg"; static const ic_sort = "assets/$ORGANIZATION/icons/ic_sort.png"; static const ic_featured = "assets/$ORGANIZATION/icons/ic_featured.svg"; - static const ic_congratulations = "assets/$ORGANIZATION/icons/ic_congratulations.svg"; + static const ic_congratulations = "assets/$ORGANIZATION/icons/ic_congratulations!.svg"; static const ic_correct_icon = "assets/$ORGANIZATION/icons/ic_congratulation.svg"; static const ic_arrow = "assets/$ORGANIZATION/icons/ic_arrow.svg"; diff --git a/lib/app/models/resend_otp_usend.dart b/lib/app/models/resend_otp_usend.dart index 5eab57d..4aa8418 100644 --- a/lib/app/models/resend_otp_usend.dart +++ b/lib/app/models/resend_otp_usend.dart @@ -8,6 +8,7 @@ class ResendOtpUsendModel { String? email; String? pinType; bool? isOtpRequired; + String? transPincode; ResendOtpUsendModel({ this.porOrgacode, @@ -17,6 +18,7 @@ class ResendOtpUsendModel { this.email, this.pinType, this.isOtpRequired, + this.transPincode, }); Map toMap() { @@ -43,7 +45,9 @@ class ResendOtpUsendModel { if (isOtpRequired != null) { result.addAll({'isOtpRequired': isOtpRequired}); } - + if (transPincode != null) { + result.addAll({'transPincode': transPincode}); + } return result; } @@ -56,6 +60,7 @@ class ResendOtpUsendModel { email: map['email'], pinType: map['pinType'], isOtpRequired: map['isOtpRequired'], + transPincode:map['transPincode'], ); } diff --git a/lib/app/modules/add_money/controllers/add_money_otp_controller.dart b/lib/app/modules/add_money/controllers/add_money_otp_controller.dart index e38edd7..986ad6d 100644 --- a/lib/app/modules/add_money/controllers/add_money_otp_controller.dart +++ b/lib/app/modules/add_money/controllers/add_money_otp_controller.dart @@ -93,8 +93,9 @@ class AddMoneyOTPController extends GetxController { email: SessionCache.instance.userInfo.cmpUserId, cmpCustcode: SessionCache.instance.userInfo.cmpCustcode, isOtpRequired: false, + transPincode:"123456", pctCstycode: SessionCache.instance.userInfo.pctCstycode, - pinType: 'C_TRANPIN', + pinType: 'TRAN', )); isResend.value = false; diff --git a/lib/app/modules/add_money/views/add_money_view.dart b/lib/app/modules/add_money/views/add_money_view.dart index e2af63f..43e8469 100644 --- a/lib/app/modules/add_money/views/add_money_view.dart +++ b/lib/app/modules/add_money/views/add_money_view.dart @@ -76,22 +76,19 @@ class AddMoneyView extends GetView { }, child: Container( color: AppColors.transparent, - child: SizedBox( - width: 92, - height: 60, - child: Row( - children: [ - Image.asset(controller.getFlagWithCurrencyCode(controller.selectedFromAccountCurrency.value.pcrCurrcode), width: 22), - const SizedBox(width: 6), - Text( - controller.selectedFromAccountCurrency.value.dmpProdshort, - style: context.textTheme.bodyMedium!.copyWith(fontSize: 16, color: AppColors.colorPrimary, fontWeight: FontWeight.w600), - ), - const SizedBox(width: 6), - Image.asset(AppAssets.drop_down_ic, width: 10, height: 10), - const SizedBox(width: 6), - ], - ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Image.asset(controller.getFlagWithCurrencyCode(controller.selectedFromAccountCurrency.value.pcrCurrcode), width: 22), + const SizedBox(width: 6), + Text( + controller.selectedFromAccountCurrency.value.dmpProdshort, + style: context.textTheme.bodyMedium!.copyWith(fontSize: 16, color: AppColors.colorPrimary, fontWeight: FontWeight.w600), + ), + const SizedBox(width: 6), + Image.asset(AppAssets.drop_down_ic, width: 10, height: 10), + const SizedBox(width: 15), + ], ), ), ), diff --git a/lib/app/modules/dashboard/views/shared/drawer_data.dart b/lib/app/modules/dashboard/views/shared/drawer_data.dart index 37e956b..a5ec324 100644 --- a/lib/app/modules/dashboard/views/shared/drawer_data.dart +++ b/lib/app/modules/dashboard/views/shared/drawer_data.dart @@ -63,17 +63,20 @@ class DrawerData extends GetView { }), ), const SizedBox(width: 15), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Text(SessionCache.instance.userInfo.name, style: Theme.of(context).textTheme.titleLarge), - const SizedBox(height: 2), - Text(SessionCache.instance.userInfo.cmpCustlastlogin != null ? SessionCache.instance.userInfo.cmpCustlastlogin : "N/A", - /*TranslationKeys.makeTranslation( - TranslationKeys.textAccountSession),*/ - style: Theme.of(context).textTheme.bodyMedium), - ], + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text(SessionCache.instance.userInfo.name, style: Theme.of(context).textTheme.titleLarge), + const SizedBox(height: 2), + Text(SessionCache.instance.userInfo.cmpCustlastlogin != null ? SessionCache.instance.userInfo.cmpCustlastlogin : "N/A", + /*TranslationKeys.makeTranslation( + TranslationKeys.textAccountSession),*/ + overflow: TextOverflow.ellipsis, + style: Theme.of(context).textTheme.bodyMedium), + ], + ), ), ], ), @@ -189,7 +192,7 @@ class DrawerData extends GetView { color: AppColors.colorPrimary, ), const SizedBox(width: 15), - Text(item.title, style: Theme.of(context).textTheme.titleSmall?.copyWith(fontSize: 15, fontWeight: FontWeight.w400)), + Expanded(child: Text(item.title, style: Theme.of(context).textTheme.titleSmall?.copyWith(fontSize: 15, fontWeight: FontWeight.w400))), ], ), ),