diff --git a/lib/components/organism_components/menu_component/menu_component_model.dart b/lib/components/organism_components/menu_component/menu_component_model.dart index 621817b8..07f56b9c 100644 --- a/lib/components/organism_components/menu_component/menu_component_model.dart +++ b/lib/components/organism_components/menu_component/menu_component_model.dart @@ -123,7 +123,7 @@ class MenuComponentModel extends FlutterFlowModel { alignment: Alignment.bottomCenter, ), }, - ); + ).then((value) => true); } Future liberationHistoryOptAction(BuildContext context) async { diff --git a/lib/components/organism_components/menu_component/menu_component_widget.dart b/lib/components/organism_components/menu_component/menu_component_widget.dart index 05c08889..7f47739e 100644 --- a/lib/components/organism_components/menu_component/menu_component_widget.dart +++ b/lib/components/organism_components/menu_component/menu_component_widget.dart @@ -254,7 +254,7 @@ class _MenuComponentWidgetState extends State { MenuCardItem( icon: Icons.settings, action: () async { - await _model.preferencesSettings(context); + await _model.preferencesSettings(context).then((value) => value); setState(() {}); }, title: FFLocalizations.of(context).getVariableText( diff --git a/lib/pages/home_page/home_page_widget.dart b/lib/pages/home_page/home_page_widget.dart index 80448748..92851a69 100644 --- a/lib/pages/home_page/home_page_widget.dart +++ b/lib/pages/home_page/home_page_widget.dart @@ -38,15 +38,14 @@ class _HomePageWidgetState extends State { () async { await FirebaseMessagingService().updateDeviceToken(); }(); - () async { - PhpGroup.getDadosCall + void fetchData() async { + await PhpGroup.getDadosCall .call( devUUID: AppState().devUUID, userUUID: AppState().userUUID, cliUUID: AppState().cliUUID, atividade: 'getDados') .then((value) async { - // value = await value; if (value.statusCode == 200 && value.jsonBody['error'] == false) { AppState().whatsapp = value.jsonBody['whatsapp']; AppState().provisional = value.jsonBody['provisional']; @@ -54,8 +53,10 @@ class _HomePageWidgetState extends State { await DialogUtil.warningDefault(context) .then((value) => safeSetState(() {})); } - }); - }(); + }).then((value) => fetchData()); + } + + fetchData(); WidgetsBinding.instance.addPostFrameCallback((_) async { localStatus = await checkLocals( diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart index 158ca1fb..53637a29 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_model.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart @@ -314,7 +314,7 @@ class PreferencesPageModel with ChangeNotifier { AppState().deleteLocal(); AppState().deleteOwnerUUID(); Navigator.pop(context); - Navigator.pop(context); + Navigator.pop(context, true); ScaffoldMessenger.of(context).showSnackBar( SnackBar(