Merge pull request #30 from Ishad-M-I-M/main

Error handling in settings page

Author: Ishad-M-I-M

Diff for: lib/bloc/settings/settings_bloc.dart

@@ -5,35 +5,45 @@ import '../../services/secure_storage_service.dart';
 import '../../services/user_contract_service.dart';
 
 part 'settings_event.dart';
-
 part 'settings_state.dart';
 
 class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
   SettingsBloc() : super(Initial()) {
     on<LoadEvent>((event, emit) async {
       emit(Loading());
-      var privateKey = await SecureStorageService.get("private-key") as String;
-      var contractAddress =
-          await SecureStorageService.get("contract-address") as String;
 
-      var service = UserContractService();
-      var userInfo = await service.getAll(contractAddress, privateKey);
-      emit(Loaded(
-          privateKey: privateKey,
-          contractAddress: contractAddress,
-          email: userInfo['Email'] as String,
-          phone: userInfo['Phone'] as String));
+      try {
+        var privateKey =
+            await SecureStorageService.get("private-key") as String;
+        var contractAddress =
+            await SecureStorageService.get("contract-address") as String;
+
+        var service = UserContractService();
+        var userInfo = await service.getAll(contractAddress, privateKey).timeout(const Duration(seconds: 10), onTimeout: (){
+          throw Exception("Timeout");
+        });
+        emit(Loaded(
+            privateKey: privateKey,
+            contractAddress: contractAddress,
+            email: userInfo['Email'] as String,
+            phone: userInfo['Phone'] as String));
+      } catch (e) {
+        emit(Failed(e.toString()));
+      }
     });
 
     on<EditEvent>((event, emit) async {
       emit(Loading());
-      try{
+      try {
         var service = UserContractService();
-        if (event.editedProperty == "email"){
-          await service.setEmail(event.email, contractAddress: event.contractAddress, privateKey: event.privateKey);
-        }
-        else if(event.editedProperty == "phone"){
-          await service.setMobile(event.phone, contractAddress: event.contractAddress, privateKey: event.privateKey);
+        if (event.editedProperty == "email") {
+          await service.setEmail(event.email,
+              contractAddress: event.contractAddress,
+              privateKey: event.privateKey);
+        } else if (event.editedProperty == "phone") {
+          await service.setMobile(event.phone,
+              contractAddress: event.contractAddress,
+              privateKey: event.privateKey);
         }
         else{
           throw Exception("Unexpected Error");

Diff for: lib/pages/settings_page.dart

@@ -40,7 +40,11 @@ class _SettingsPageState extends State<SettingsPage> {
                 create: (context) => _settings_bloc,
                 child: BlocConsumer<SettingsBloc, SettingsState>(
                   listener: (context, state) {
-                    // TODO: implement listener
+                    if(state is Failed){
+                      Navigator.popAndPushNamed(context, '/error', arguments: {
+                        "message": state.message
+                      });
+                    }
                   },
                   builder: (context, state) {
                     if (state is Initial || state is Loading) {