Fix/ddw 242 Step for active restore notification is too fragile

CHANGELOG.md

@@ -11,6 +11,7 @@ Changelog
 
 - Added acceptance tests for displaying transactions in various contexts ([PR 870](https://github.com/input-output-hk/daedalus/pull/870))
 - Refactored various magic numbers & strings into constants ([PR 881](https://github.com/input-output-hk/daedalus/pull/881))
+- Fixed wallet restoration and import fragile acceptance tests steps definitions ([PR 885](https://github.com/input-output-hk/daedalus/pull/885))
 
 ## 0.10.0
 

features/step_definitions/wallets-steps.js

@@ -18,7 +18,10 @@ import sidebar from '../support/helpers/sidebar-helpers';
 import addWalletPage from '../support/helpers/add-wallet-page-helpers';
 import importWalletDialog from '../support/helpers/dialogs/import-wallet-dialog-helpers';
 import i18n from '../support/helpers/i18n-helpers';
-import { waitForActiveRestoreNotification } from '../support/helpers/notifications-helpers';
+import {
+  isActiveWalletBeingRestored,
+  waitForActiveRestoreNotification
+} from '../support/helpers/notifications-helpers';
 
 const defaultWalletKeyFilePath = path.resolve(__dirname, '../support/default-wallet.key');
 const defaultWalletJSONFilePath = path.resolve(__dirname, '../support/default-wallet.json');
@@ -352,15 +355,21 @@ Then(/^I should not see the restore wallet dialog anymore$/, function () {
 });
 
 Then(/^I should see the restore status notification while import is running$/, async function () {
-  await waitForActiveRestoreNotification(this.client);
+  // Only check the rendered DOM if the restore is still in progress
+  if (await isActiveWalletBeingRestored(this.client)) {
+    await waitForActiveRestoreNotification(this.client);
+  }
 });
 
 Then(/^I should not see the restore status notification once import is finished$/, async function () {
   await waitForActiveRestoreNotification(this.client, { isHidden: true });
 });
 
 Then(/^I should see the restore status notification while restore is running$/, async function () {
-  await waitForActiveRestoreNotification(this.client);
+  // Only check the rendered DOM if the restore is still in progress
+  if (await isActiveWalletBeingRestored(this.client)) {
+    await waitForActiveRestoreNotification(this.client);
+  }
 });
 
 Then(/^I should not see the restore status notification once restore is finished$/, async function () {

features/support/helpers/notifications-helpers.js

@@ -1,3 +1,12 @@
+import { syncStateTags } from '../../../source/renderer/app/domains/Wallet';
+
+export const isActiveWalletBeingRestored = async (client) => {
+  const result = await client.execute((expectedSyncTag) => (
+    daedalus.stores.ada.wallets.active.syncState.tag === expectedSyncTag
+  ), syncStateTags.RESTORING);
+  return result.value;
+};
+
 export const waitForActiveRestoreNotification = (client, { isHidden } = {}) => (
   client.waitForVisible('.ActiveRestoreNotification', null, isHidden)
 );