From a2b24d8ce09995d449ef1fcf0d8b791f84deb77a Mon Sep 17 00:00:00 2001 From: Eldar2021 Date: Mon, 10 Jul 2023 08:48:40 +0600 Subject: [PATCH] remove announcement error dialog --- .../logic/announcement_store.dart | 3 + .../announcement/view/announcement_view.dart | 67 ------------------- 2 files changed, 3 insertions(+), 67 deletions(-) diff --git a/app/lib/page/assets/announcement/logic/announcement_store.dart b/app/lib/page/assets/announcement/logic/announcement_store.dart index 132158ba3..f2ed6662f 100644 --- a/app/lib/page/assets/announcement/logic/announcement_store.dart +++ b/app/lib/page/assets/announcement/logic/announcement_store.dart @@ -5,6 +5,7 @@ import 'package:mobx/mobx.dart'; import 'package:encointer_wallet/models/announcement/announcement.dart'; import 'package:encointer_wallet/utils/fetch_status.dart'; +import 'package:encointer_wallet/service/service.dart'; import 'package:encointer_wallet/config/consts.dart'; part 'announcement_store.g.dart'; @@ -56,6 +57,7 @@ abstract class _AnnouncementStoreBase with Store { communityAnnouncementsResponse.fold((l) { error = l.error.toString(); + Log.e('announcement_view', '${l.error}'); fetchStatus = FetchStatus.error; }, (r) { announcementsCommunnity = r; @@ -75,6 +77,7 @@ abstract class _AnnouncementStoreBase with Store { globalAnnouncementsResponse.fold((l) { error = l.error.toString(); + Log.e('announcement_view', '${l.error}'); fetchStatus = FetchStatus.error; }, (r) { announcementsGlobal = r; diff --git a/app/lib/page/assets/announcement/view/announcement_view.dart b/app/lib/page/assets/announcement/view/announcement_view.dart index dd7281c2a..cf2c2fc92 100644 --- a/app/lib/page/assets/announcement/view/announcement_view.dart +++ b/app/lib/page/assets/announcement/view/announcement_view.dart @@ -1,6 +1,5 @@ import 'package:ew_http/ew_http.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; -import 'package:mobx/mobx.dart'; import 'package:provider/provider.dart'; import 'package:flutter/cupertino.dart'; @@ -8,15 +7,9 @@ import 'package:encointer_wallet/models/announcement/announcement.dart'; import 'package:encointer_wallet/utils/repository_provider.dart'; import 'package:encointer_wallet/modules/modules.dart'; import 'package:encointer_wallet/page/assets/announcement/logic/announcement_card_store.dart'; -import 'package:encointer_wallet/service/log/log_service.dart'; -import 'package:encointer_wallet/utils/alerts/app_alert.dart'; -import 'package:encointer_wallet/utils/extensions/string/string_extensions.dart'; import 'package:encointer_wallet/utils/fetch_status.dart'; import 'package:encointer_wallet/page/assets/announcement/logic/announcement_store.dart'; import 'package:encointer_wallet/page/assets/announcement/widgets/announcement_card.dart'; -import 'package:encointer_wallet/l10n/l10.dart'; - -const _logTarget = 'announcement_view'; class AnnouncementView extends StatefulWidget { const AnnouncementView({ @@ -37,7 +30,6 @@ class AnnouncementView extends StatefulWidget { class _AnnouncementViewState extends State { late final AnnouncementStore _announcementStore; - List _disposers = []; @override void initState() { @@ -47,24 +39,9 @@ class _AnnouncementViewState extends State { await _getAnnouncements(); }); - _listenToErrors(); - super.initState(); } - @override - void dispose() { - /// Important! Do not forget to dispose all disposable variables - /// which may lead to a memory leak issues - if (_disposers.isNotEmpty) { - for (final d in _disposers) { - d(); - } - } - - super.dispose(); - } - @override Widget build(BuildContext context) { return Observer(builder: (_) { @@ -76,32 +53,6 @@ class _AnnouncementViewState extends State { }); } - void _listenToErrors() { - _disposers = [ - /// in case of an unknown error, it triggers dialog to popup - reaction((_) => _announcementStore.error.isNotNullOrEmpty, (result) { - if (result) { - AppAlert.showErrorDialog( - context, - errorText: _getErrorMessages(failureType: FailureType.unknown, error: _announcementStore.error), - buttontext: context.l10n.ok, - ); - } - }), - - /// in case of a known error, it triggers dialog to popup - reaction((_) => _announcementStore.failureType != null, (result) { - if (result) { - AppAlert.showErrorDialog( - context, - errorText: _getErrorMessages(failureType: _announcementStore.failureType!, error: _announcementStore.error), - buttontext: context.l10n.ok, - ); - } - }) - ]; - } - Future _getAnnouncements() async { final devMode = context.read().developerMode; await Future.wait([ @@ -110,24 +61,6 @@ class _AnnouncementViewState extends State { devMode: devMode, langCode: Localizations.localeOf(context).languageCode), ]); } - - String _getErrorMessages({ - required FailureType failureType, - - /// [error] is required because we check for it first - /// if it's not null we return needed localized text - required String? error, - }) { - Log.d('_getErrorMessages: failureType = $failureType, error = $error', _logTarget); - if (error.isNotNullOrEmpty) { - return '${context.l10n.announcements} ${context.l10n.errorMessageWithStatusCode(error!)}'; - } - return switch (failureType) { - FailureType.badRequest => '${context.l10n.announcements} ${context.l10n.badRequest}', - FailureType.noAuthorization => '${context.l10n.announcements} ${context.l10n.noAuthorizationError}', - _ => '${context.l10n.announcements} ${context.l10n.somethingWentWrong}', - }; - } } class AnnouncementList extends StatelessWidget {