Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Show error messages

This commit is contained in:
Hillel Coren 2021-04-30 07:44:38 +03:00
parent effbc21115
commit 75b3638411
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ui/app/dialogs/health_check_dialog.dart
View File

@ -8,6 +8,7 @@ import 'package:invoiceninja_flutter/data/web_client.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
import 'package:invoiceninja_flutter/utils/dialogs.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
class HealthCheckDialog extends StatefulWidget { class HealthCheckDialog extends StatefulWidget {
@ -43,11 +44,7 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
HealthCheckResponse.serializer, response); HealthCheckResponse.serializer, response);
}); });
}).catchError((dynamic error) { }).catchError((dynamic error) {
showDialog<ErrorDialog>( showErrorDialog(context: context, message: error);
context: context,
builder: (BuildContext context) {
return ErrorDialog(error);
});
}); });
} }
@ -69,11 +66,7 @@ class _HealthCheckDialogState extends State<HealthCheckDialog> {
runCheck(); runCheck();
}))); })));
}).catchError((dynamic error) { }).catchError((dynamic error) {
showDialog<ErrorDialog>( showErrorDialog(context: context, message: error);
context: context,
builder: (BuildContext context) {
return ErrorDialog(error);
});
}); });
} }

13
lib/ui/app/upgrade_dialog.dart
View File

@ -12,6 +12,7 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/alert_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart'; import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/utils/dialogs.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart'; import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
@ -57,9 +58,15 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
}; };
try { try {
final dynamic response = await webClient.post( final dynamic response = await webClient
'$kAppProductionUrl/api/v1/upgrade', state.credentials.token, .post(
data: json.encode(data)); '$kAppProductionUrl/api/v1/upgrade',
state.credentials.token,
data: json.encode(data),
)
.catchError((dynamic error) {
showErrorDialog(context: context, message: error);
});
final String message = response['message']; final String message = response['message'];
if (message == 'success') { if (message == 'success') {

4
lib/ui/settings/user_details.dart
View File

@ -1,5 +1,6 @@
import 'dart:convert'; import 'dart:convert';
import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart';
import 'package:invoiceninja_flutter/main_app.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/utils/oauth.dart'; import 'package:invoiceninja_flutter/utils/oauth.dart';
import 'package:qr_flutter/qr_flutter.dart'; import 'package:qr_flutter/qr_flutter.dart';
@ -352,6 +353,9 @@ class _EnableTwoFactorState extends State<_EnableTwoFactor> {
_qrCode = response.data.qrCode; _qrCode = response.data.qrCode;
_secret = response.data.secret; _secret = response.data.secret;
}); });
}).catchError((dynamic error) {
Navigator.of(context).pop();
showErrorDialog(context: context, message: error);
}); });
} }