diff --git a/packages/chicken/lib/presentation/pages/auth/view.dart b/packages/chicken/lib/presentation/pages/auth/view.dart index ef0d429..86ca51c 100644 --- a/packages/chicken/lib/presentation/pages/auth/view.dart +++ b/packages/chicken/lib/presentation/pages/auth/view.dart @@ -10,6 +10,7 @@ class AuthPage extends GetView { @override Widget build(BuildContext context) { + iLog("AuthPage"); return Scaffold( body: Stack( alignment: Alignment.center, diff --git a/packages/chicken/lib/presentation/pages/buy_in_province_all/view.dart b/packages/chicken/lib/presentation/pages/buy_in_province_all/view.dart index 8a01cbc..fe18e6e 100644 --- a/packages/chicken/lib/presentation/pages/buy_in_province_all/view.dart +++ b/packages/chicken/lib/presentation/pages/buy_in_province_all/view.dart @@ -100,7 +100,7 @@ class BuyInProvinceAllPage extends GetView { ), Text( - item.steward?.guildsName ?? 'N/A', + item.toSteward?.guildsName ?? 'N/Aaq', textAlign: TextAlign.start, style: AppFonts.yekan12.copyWith(color: AppColor.bgDark), ), diff --git a/packages/chicken/lib/presentation/pages/root/logic.dart b/packages/chicken/lib/presentation/pages/root/logic.dart index 286803e..1b26461 100644 --- a/packages/chicken/lib/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/presentation/pages/root/logic.dart @@ -50,9 +50,9 @@ class RootLogic extends GetxController { localDatasource = diChicken.get(); chickenRepository = diChicken.get(); - localDatasource.openBox().then((value) async { + /*localDatasource.openBox().then((value) async { widelyUsedList.value = localDatasource.getAllWidely(); - }); + });*/ } diff --git a/packages/chicken/lib/presentation/pages/sales_in_province/view.dart b/packages/chicken/lib/presentation/pages/sales_in_province/view.dart index 6930717..762ec3d 100644 --- a/packages/chicken/lib/presentation/pages/sales_in_province/view.dart +++ b/packages/chicken/lib/presentation/pages/sales_in_province/view.dart @@ -132,7 +132,7 @@ class SalesInProvincePage extends GetView { ); } - itemListWidget(AllocatedMadeModel item) { + Row itemListWidget(AllocatedMadeModel item) { return Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ @@ -144,7 +144,7 @@ class SalesInProvincePage extends GetView { spacing: 4, children: [ Text( - controller.getBuyerInformation(item)?.user?.fullname ?? 'N/A', + controller.getBuyerInformation(item)?.user?.fullname ?? 'N/Aشششش', textAlign: TextAlign.center, style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal), ), @@ -208,7 +208,7 @@ class SalesInProvincePage extends GetView { ); } - itemListExpandedWidget(AllocatedMadeModel item, int index) { + Container itemListExpandedWidget(AllocatedMadeModel item, int index) { return Container( padding: EdgeInsets.symmetric(horizontal: 8), decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)), diff --git a/packages/core/lib/infrastructure/remote/app_interceptor.dart b/packages/core/lib/infrastructure/remote/app_interceptor.dart index 5685f57..a19df61 100644 --- a/packages/core/lib/infrastructure/remote/app_interceptor.dart +++ b/packages/core/lib/infrastructure/remote/app_interceptor.dart @@ -107,9 +107,5 @@ class AppInterceptor extends Interceptor { //TODO void _handleRefreshFailure() { ApiHandler.cancelAllRequests("Token refresh failed"); - - if (Get.currentRoute != '/Auth') { - Get.offAllNamed('/Auth', arguments: authArguments ?? 'Module.chicken'); - } } }