Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove announcement error dialog #1360

Merged
merged 3 commits into from
Jul 11, 2023
Merged

Remove announcement error dialog #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2b24d8
remove announcement error dialog
Eldar2021 Jul 10, 2023
8624c34
added languagecode to global announcements
Eldar2021 Jul 10, 2023
7fe823a
Merge branch 'master' into el/announcement-error-dialog
clangenb Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/lib/page/assets/announcement/logic/announcement_store.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
Expand All @@ -66,15 +68,16 @@ abstract class _AnnouncementStoreBase with Store {
}

@action
Future<void> getGlobalAnnouncements({bool devMode = false}) async {
Future<void> getGlobalAnnouncements({bool devMode = false, required String langCode}) async {
if (fetchStatus != FetchStatus.loading) fetchStatus = FetchStatus.loading;
final globalAnnouncementsResponse = await ewHttp.getTypeList<Announcement>(
'${getEncointerFeedLink(devMode: devMode)}/announcements/global/en/announcements.json',
'${getEncointerFeedLink(devMode: devMode)}/announcements/global/$langCode/announcements.json',
Eldar2021 marked this conversation as resolved.
Show resolved Hide resolved
fromJson: Announcement.fromJson,
);

globalAnnouncementsResponse.fold((l) {
error = l.error.toString();
Log.e('announcement_view', '${l.error}');
fetchStatus = FetchStatus.error;
}, (r) {
announcementsGlobal = r;
Expand Down
5 changes: 3 additions & 2 deletions app/lib/page/assets/announcement/logic/announcement_store.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 3 additions & 70 deletions app/lib/page/assets/announcement/view/announcement_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
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';

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({
Expand All @@ -37,7 +30,6 @@ class AnnouncementView extends StatefulWidget {

class _AnnouncementViewState extends State<AnnouncementView> {
late final AnnouncementStore _announcementStore;
List<ReactionDisposer> _disposers = <ReactionDisposer>[];

@override
void initState() {
Expand All @@ -47,24 +39,9 @@ class _AnnouncementViewState extends State<AnnouncementView> {
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: (_) {
Expand All @@ -76,58 +53,14 @@ class _AnnouncementViewState extends State<AnnouncementView> {
});
}

void _listenToErrors() {
_disposers = <ReactionDisposer>[
/// 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<void> _getAnnouncements() async {
final devMode = context.read<AppSettings>().developerMode;
final languageCode = Localizations.localeOf(context).languageCode;
await Future.wait([
_announcementStore.getGlobalAnnouncements(devMode: devMode),
_announcementStore.getCommunityAnnouncements(widget.cid,
devMode: devMode, langCode: Localizations.localeOf(context).languageCode),
_announcementStore.getGlobalAnnouncements(devMode: devMode, langCode: languageCode),
_announcementStore.getCommunityAnnouncements(widget.cid, devMode: devMode, langCode: 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 {
Expand Down
Loading