Rewrite fully second db table into result

src/pages/import.rs

@@ -4,7 +4,7 @@ use crate::pages::import::ImportMessage::*;
 use crate::data::entities::{WordData, WordGroup};
 use crate::navigation::{NavigatedPage, Page, RootMessage};
 use crate::notification::NotificationData::OpenFileError;
-use crate::notification::{NotificationData, NotificationRequest};
+use crate::notification::NotificationData;
 use crate::styling::*;
 use iced::widget::button::danger;
 use iced::widget::container::success;
@@ -28,6 +28,7 @@ use tokio::task::spawn_blocking;
 use zip::ZipArchive;
 use crate::app::AppState;
 use crate::fs::*;
+use crate::push_error;
 
 const DEFAULT_FIELDS: [&str; 6] = ["key", "value", "tags", "reading", "context", "description"];
 
@@ -367,7 +368,7 @@ impl ImportState {
             },
             |result: Result<ImportData, NotificationData>| match result {
                 Ok(import) => RootMessage::Import(UpdateImport(import)),
-                Err(err) => RootMessage::PushNotification(NotificationRequest::Error(err)),
+                Err(err) => push_error!(err),
             },
         )
     }
@@ -499,7 +500,7 @@ impl ImportState {
             },
             |r: Result<(), NotificationData>| match r {
                 Ok(_) => RootMessage::Import(ImportFinished),
-                Err(err) => RootMessage::PushNotification(NotificationRequest::Error(err))
+                Err(err) => push_error!(err)
             }
         )
     }