diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart index f7d58b36..fa7d4a6a 100644 --- a/lib/pages/DrawerPages/family/my-family.dart +++ b/lib/pages/DrawerPages/family/my-family.dart @@ -446,11 +446,10 @@ class _MyFamily extends State with TickerProviderStateMixin { this.familyFileProvider.deativateActivateMemberFile(request).then((value) => refreshFamily(context)); } - refreshFamily(context) { - setState(() { - sharedPref.remove(FAMILY_FILE); - checkUserData(); - }); + refreshFamily(context) async { + + await sharedPref.remove(FAMILY_FILE); + await checkUserData(); } switchUser(user, context) { @@ -525,17 +524,23 @@ class _MyFamily extends State with TickerProviderStateMixin { Map request = {}; request["ID"] = ID; request["Status"] = status; - this.familyFileProvider.acceptRejectFamily(request).then((value) => {GifLoaderDialogUtils.hideDialog(context), refreshFamily(context)}); + this.familyFileProvider.acceptRejectFamily(request).then((value) async{ + + await refreshFamily(context); + GifLoaderDialogUtils.hideDialog(context); + }); } checkUserData() async { if (await this.sharedPref.getObject(USER_PROFILE) != null) { var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE)); - var data2 = AuthenticatedUser.fromJson(await this.sharedPref.getObject(MAIN_USER)); + // var data2 = AuthenticatedUser.fromJson(await this.sharedPref.getObject(MAIN_USER)); await getFamilyFiles(); - setState(() { + this.user = data; - }); + setState(() { + + }); } } @@ -552,16 +557,20 @@ class _MyFamily extends State with TickerProviderStateMixin { GifLoaderDialogUtils.showMyDialog(context); try { if (familySharedRecords == null) { + familySharedRecords = await familyFileProvider.getSharedRecordByStatus(); } + sentRecordsList =[]; familySharedRecords.getAllSharedRecordsByStatusList.forEach((element) { if (element.status == 3) { familySharedRecordsList.add(element); } sentRecordsList.add(element); }); - + approvedRecordsList =[]; + pendingRecordsList =[]; GetAllSharedRecordsByStatusResponse pendingAndApprovedRecords = await getUserViewRequest(); + pendingAndApprovedRecords.getAllSharedRecordsByStatusList.forEach((element) { print(element.toJson()); if (element.status == 2) { @@ -571,6 +580,7 @@ class _MyFamily extends State with TickerProviderStateMixin { } }); } catch (ex) { + familySharedRecords = GetAllSharedRecordsByStatusResponse(getAllSharedRecordsByStatusList: []); } GifLoaderDialogUtils.hideDialog(context);