Merge pull request #1514 from Hirobreak/404-event

more on handling event 404 with new banner type

Author: javiteri95

email_mailbox/src/components/Message.js

@@ -20,7 +20,8 @@ const renderMessageType = props => {
     props.type === MessageType.SUCCESS ||
     props.type === MessageType.ERROR ||
     props.type === MessageType.ESTABLISH ||
-    props.type === MessageType.ANNOUNCEMENT
+    props.type === MessageType.ANNOUNCEMENT ||
+    props.type === MessageType.REQUIREMENT
   ) {
     return <MessageStandard {...props} />;
   } else if (props.type === MessageType.QUESTION) {
@@ -97,6 +98,8 @@ const defineMessageClass = type => {
       return 'message-establish';
     case MessageType.ANNOUNCEMENT:
       return 'message-announcement';
+    case MessageType.REQUIREMENT:
+      return 'message-requirement';
     default:
       break;
   }
@@ -120,7 +123,8 @@ export const MessageType = {
   SUCCESS: 4,
   ERROR: 5,
   ESTABLISH: 6,
-  ANNOUNCEMENT: 7
+  ANNOUNCEMENT: 7,
+  REQUIREMENT: 8
 };
 
 export const MessageActionStatus = {

email_mailbox/src/components/MessageWrapper.js

@@ -113,6 +113,7 @@ class MessageWrapper extends Component {
       displayMessage: true
     };
     this.setState(newState, () => {
+      if (type === MessageType.REQUIREMENT) return;
       const isImportantMessage =
         ask ||
         priority === messagePriorities.HIGH ||

email_mailbox/src/components/message.scss

@@ -36,6 +36,7 @@
       }
 
       &.message-suggestion,
+      &.message-requirement,
       &.message-announcement {
         background-color: #0091ff;
         border-color: #0091ff;

email_mailbox/src/data/message.js

@@ -242,6 +242,10 @@ const messagesContent = {
     announcement: {
       priority: messagePriorities.MEDIUM,
       description: ''
+    },
+    requirement: {
+      priority: messagePriorities.LOW,
+      description: ''
     }
   }
 };

email_mailbox/src/utils/electronEventInterface.js

@@ -1471,24 +1471,21 @@ const handleUpdateDeviceTypeEvent = async ({ rowid }) => {
   return status === 200 ? { rowid } : { rowid: null };
 };
 
-const handleActionRequiredEvent = async (
-  { rowid, params },
-  accountRecipientId
-) => {
+const handleActionRequiredEvent = async ({ params }, accountRecipientId) => {
   if (accountRecipientId !== myAccount.recipientId) return { rowid: null };
 
   const { code } = params;
   const updateAnnouncement = await getNews({ code });
 
   const messageData = {
-    ...Messages.news.announcement,
-    type: MessageType.ANNOUNCEMENT,
+    ...Messages.news.requirement,
+    type: MessageType.REQUIREMENT,
     description: updateAnnouncement.title,
     actionHandlerKey: actionHandlerKeys.error.billing,
     action: string.messages.actionRequired.update
   };
   emitter.emit(Event.DISPLAY_MESSAGE, messageData);
-  return { rowid };
+  return { rowid: null };
 };
 
 const handleSuspendedAccountEvent = accountRecipientId => {