Merge pull request #107 from BinaryStudioAcademy/fix/thjs-62-toast-notification-doesnot-appear-after-post-was-liked

thjs-62: Toast notification does not appear after post was liked

Author: v0ldemar01

client/src/packages/socket/socket-api.js

@@ -1,7 +1,7 @@
 import { io } from 'socket.io-client';
 
 class Socket {
-  getInstance = (namespace) => {
+  getInstance = namespace => {
     return io(namespace, {
       transports: ['websocket']
     });

client/src/packages/store/middlewares/notification-socket/notification-socket.middleware.js

@@ -1,3 +1,4 @@
+/* eslint-disable unicorn/prefer-regexp-test */
 import {
   NotificationMessage,
   NotificationSocketEvent,
@@ -30,14 +31,14 @@ const notificationSocket = ({ dispatch }) => {
   });
 
   return next => action => {
-    if (new RegExp(action).test(notificationActionCreator.joinRoom)) {
+    if (notificationActionCreator.joinRoom.match(action)) {
       notificationSocketInstance.emit(
         SocketEvent.NOTIFICATION_JOIN_ROOM,
         `${action.payload}`
       );
     }
 
-    if (new RegExp(action).test(notificationActionCreator.leaveRoom)) {
+    if (notificationActionCreator.leaveRoom.match(action)) {
       notificationSocketInstance.emit(
         SocketEvent.NOTIFICATION_LEAVE_ROOM,
         `${action.payload}`

client/vite.config.js

@@ -8,10 +8,14 @@ dns.setDefaultResultOrder('verbatim');
 
 const config = ({ mode }) => {
   // import.meta.env doesn't exist at this moment
-  const { VITE_PORT, VITE_HOST, VITE_API_PATH, VITE_API_SERVER, VITE_SOCKET_SERVER, VITE_SOCKET_PATH } = loadEnv(
-    mode,
-    process.cwd()
-  );
+  const {
+    VITE_PORT,
+    VITE_HOST,
+    VITE_API_PATH,
+    VITE_API_SERVER,
+    VITE_SOCKET_SERVER,
+    VITE_SOCKET_PATH
+  } = loadEnv(mode, process.cwd());
 
   return defineConfig({
     resolve: {
@@ -27,8 +31,8 @@ const config = ({ mode }) => {
         [VITE_API_PATH]: VITE_API_SERVER,
         [VITE_SOCKET_PATH]: {
           target: VITE_SOCKET_SERVER,
-          ws: true,
-        },
+          ws: true
+        }
       }
     },
     plugins: [reactPlugin()]