feat(neuron-ui): dismiss pinned top alert if it's related to auto-dis…

…missed notifications
nervosnetwork · Oct 11, 2019 · b1ea6d5 · b1ea6d5
1 parent 9de23cc
commit b1ea6d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/neuron-ui/src/states/stateProvider/reducer.ts b/packages/neuron-ui/src/states/stateProvider/reducer.ts
@@ -483,6 +483,10 @@ export const reducer = (
           messages: {
             ...app.messages,
           },
+          showTopAlert: !(
+            app.notifications[app.notifications.length - 1] &&
+            app.notifications[app.notifications.length - 1].code === payload
+          ),
           notifications: app.notifications.filter(({ code }) => code !== payload),
         },
       }

diff --git a/packages/neuron-wallet/tests-e2e/tests/notification.ts b/packages/neuron-wallet/tests-e2e/tests/notification.ts
@@ -79,9 +79,8 @@ export default (app: Application) => {
       client.click('button[type=submit]')
       await app.waitUntilLoaded()
       sleep(4000)
-      const alertComponent = await client.$('.ms-MessageBar-text')
-      const msg = await client.elementIdText(alertComponent.value.ELEMENT)
-      expect(msg.value).toBe(messages.disconnected)
+      const alertComponent = await client.$('.ms-MessageBar--error')
+      expect(alertComponent.state).toBe('failure')
     })
   })
 }