diff --git a/lib/api/offers_and_discounts_api_client.dart b/lib/api/offers_and_discounts_api_client.dart index 5c1eaab..34a5709 100644 --- a/lib/api/offers_and_discounts_api_client.dart +++ b/lib/api/offers_and_discounts_api_client.dart @@ -68,7 +68,7 @@ class OffersAndDiscountsApiClient { String url = "${ApiConsts.cocRest}GetOfferDiscountsConfigData"; Map postParams = { - "EmployeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER, + "EmployeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER ?? "217869", "ItgPageSize": pageSize, "ItgPageNo": 1, "ItgCategoryID": categoryID, diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart index 0d01d44..59d6904 100644 --- a/lib/app_state/app_state.dart +++ b/lib/app_state/app_state.dart @@ -92,7 +92,7 @@ class AppState { String get getHuaweiPushToken => _huaweiPushToken; - final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 10.3, mobileType: Platform.isAndroid ? "android" : "ios"); + final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 10.4, mobileType: Platform.isAndroid ? "android" : "ios"); PostParamsModel get postParamsInitConfig { if (_postParamsInitConfig.pLegislationCode == null) { diff --git a/lib/ui/mazaya/mazaya_discover_screen.dart b/lib/ui/mazaya/mazaya_discover_screen.dart index 3f1c4b0..0c67dea 100644 --- a/lib/ui/mazaya/mazaya_discover_screen.dart +++ b/lib/ui/mazaya/mazaya_discover_screen.dart @@ -12,6 +12,7 @@ import 'package:mohem_flutter_app/classes/consts.dart'; import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/models/offers_and_discounts/get_offers_list.dart'; import 'package:mohem_flutter_app/models/offers_and_discounts/wala_plus_category_model.dart'; @@ -513,7 +514,7 @@ class _MazayaDiscoverScreenState extends State { appBar: AppBarWidget( context, title: LocaleKeys.mazayaDeals.tr(), - showHomeButton: true, + showHomeButton: ApiConsts.isDependetLogin ? false : true, // Discover is the dependent-login landing page - no back button there (logout is still // reachable via the explicit logout action below). Employees reaching Discover from the // regular dashboard can still pop back normally. @@ -1078,7 +1079,7 @@ class _MazayaDiscoverScreenState extends State { title.toText20( color: const Color(0xFF202F32), weight: FontWeight.w600, - ), + ).toShimmer(isShow: isLoading), InkWell( onTap: onSeeAll, child: Row( @@ -1110,7 +1111,7 @@ class _MazayaDiscoverScreenState extends State { subtitle.toText11( color: const Color(0xFF78817F), weight: FontWeight.w400, - ), + ).toShimmer(isShow: isLoading), ], ), ), diff --git a/lib/ui/mazaya/widgets/mazaya_bottom_nav.dart b/lib/ui/mazaya/widgets/mazaya_bottom_nav.dart index 898478a..f6d85c0 100644 --- a/lib/ui/mazaya/widgets/mazaya_bottom_nav.dart +++ b/lib/ui/mazaya/widgets/mazaya_bottom_nav.dart @@ -105,13 +105,13 @@ class MazayaBottomNav extends StatelessWidget { context, tab: MazayaTab.discover, svgAsset: "assets/icons/mazaya_compass.svg", - label: LocaleKeys.discover.tr(), + label: LocaleKeys.discover.tr(context: context), ), _buildItem( context, tab: MazayaTab.saved, svgAsset: "assets/icons/mazaya_heart_outline.svg", - label: LocaleKeys.saved.tr(), + label: LocaleKeys.saved.tr(context: context), ), // My Family lets the account holder manage their dependents' Mazaya access - not // applicable (and not shown) when a dependent is the one logged in. @@ -120,7 +120,7 @@ class MazayaBottomNav extends StatelessWidget { context, tab: MazayaTab.myFamily, svgAsset: "assets/icons/mazaya_user_round.svg", - label: LocaleKeys.myFamily.tr(), + label: LocaleKeys.myFamily.tr(context: context), ), ], ),