From 0d716513d72c07be77a3196465ea902ae8ea9f68 Mon Sep 17 00:00:00 2001
From: aAbed <39409020+TheAabedKhan@users.noreply.github.com>
Date: Thu, 3 Aug 2023 07:21:39 +0545
Subject: [PATCH] fix: keystore password dialog showing up before importing
 (#1068)

---
 lib/ui/widgets/settingsView/settings_export_section.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/ui/widgets/settingsView/settings_export_section.dart b/lib/ui/widgets/settingsView/settings_export_section.dart
index 73d0f974..e4881a09 100644
--- a/lib/ui/widgets/settingsView/settings_export_section.dart
+++ b/lib/ui/widgets/settingsView/settings_export_section.dart
@@ -73,10 +73,12 @@ class SExportSection extends StatelessWidget {
             ),
           ),
           subtitle: I18nText('settingsView.importKeystoreHint'),
-          onTap: () {
-            _settingsViewModel.importKeystore();
+          onTap: () async{
+            await _settingsViewModel.importKeystore();
             final sManageKeystorePassword = SManageKeystorePassword();
-            sManageKeystorePassword.showKeystoreDialog(context);
+            if(context.mounted){
+              sManageKeystorePassword.showKeystoreDialog(context);
+            }
           },
         ),
         ListTile(