Merge branch 'stage' of gitlab.work-jetup.site:task-me/rws-web-app into stage

src/assets/img/hardDelete.svg

@@ -1,10 +1,5 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_8163_2417)">
-<path d="M12 0.00567024C8.9186 -0.0935549 5.92583 1.11285 3.67681 3.36081C1.42779 5.60877 0.105719 8.71516 0 12C0.105719 15.2848 1.42779 18.3912 3.67681 20.6392C5.92583 22.8871 8.9186 24.0936 12 23.9943C15.0814 24.0936 18.0742 22.8871 20.3232 20.6392C22.5722 18.3912 23.8943 15.2848 24 12C23.8943 8.71516 22.5722 5.60877 20.3232 3.36081C18.0742 1.11285 15.0814 -0.0935549 12 0.00567024ZM1.875 12C1.90846 9.50823 2.84985 7.12807 4.5 5.36314L18.135 19.9962C16.3305 21.3171 14.1888 22.015 12 21.9953C9.41576 22.0948 6.89972 21.0991 5.00226 19.226C3.10481 17.3528 1.9804 14.7547 1.875 12ZM19.5 18.6369L5.865 4.00378C7.66954 2.68288 9.81118 1.98504 12 2.00472C14.5842 1.90518 17.1003 2.90088 18.9977 4.77402C20.8952 6.64716 22.0196 9.24527 22.125 12C22.0915 14.4918 21.1501 16.8719 19.5 18.6369Z" fill="#7F7F7F"/>
-</g>
-<defs>
-<clipPath id="clip0_8163_2417">
-<rect width="24" height="24" fill="white"/>
-</clipPath>
-</defs>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.0769 9.32459H21.8462V8.57279C21.8462 7.32917 20.8109 6.31738 19.5385 6.31738H16.4615C15.1891 6.31738 14.1538 7.32917 14.1538 8.57279V9.32459H9.92308C8.86269 9.32459 8 10.1677 8 11.2041V13.8354C8 14.2506 8.34442 14.5872 8.76923 14.5872H9.18962L9.85418 28.2269C9.91288 29.4315 10.9254 30.3751 12.1592 30.3751H23.8408C25.0747 30.3751 26.0872 29.4315 26.1458 28.2269L26.8104 14.5872H27.2308C27.6556 14.5872 28 14.2506 28 13.8354V11.2041C28 10.1677 27.1373 9.32459 26.0769 9.32459ZM15.6923 8.57279C15.6923 8.15827 16.0374 7.82099 16.4615 7.82099H19.5385C19.9626 7.82099 20.3077 8.15827 20.3077 8.57279V9.32459H15.6923V8.57279ZM9.53846 11.2041C9.53846 10.9968 9.71101 10.8282 9.92308 10.8282H26.0769C26.289 10.8282 26.4615 10.9968 26.4615 11.2041V13.0836C26.2245 13.0836 10.5208 13.0836 9.53846 13.0836V11.2041ZM24.6091 28.1554C24.5895 28.5569 24.252 28.8715 23.8408 28.8715H12.1592C11.7479 28.8715 11.4104 28.5569 11.3909 28.1554L10.7298 14.5872H25.2702L24.6091 28.1554Z" fill="#7F7F7F"/>
+<path d="M18.9627 23.4139L19.3322 16H16.6836L17.0519 23.4139H18.9627Z" fill="#7F7F7F"/>
+<path d="M18.0094 25C17.1213 25 16.5 25.6108 16.5 26.4994C16.5 27.356 17.1031 28 17.9755 28H18.0094C18.9144 28 19.5 27.356 19.5 26.4994C19.4843 25.6108 18.8969 25 18.0094 25Z" fill="#7F7F7F"/>
 </svg>

src/scss/component/selected-rows-menu.scss

@@ -28,7 +28,7 @@
   }
 
   .hard-delete-icon {
-    height: 24px;
+    height: 34px;
   }
 
   .user-unlock-icon {

src/scss/main.scss

@@ -593,3 +593,9 @@ input[type="number"] {
 .highlight {
   color: #000 !important;
 }
+
+@media (min-width: 768px) {
+  .col-md-3 {
+    padding-right: 8px;
+  }
+}

src/shared/components/fields/input-mask-field.component.tsx

@@ -51,6 +51,7 @@ export const InputMaskField: FC<IProps> = ({
           containerStyle={{
             flexDirection: "row-reverse",
             display: "flex",
+            width: "auto",
           }}
           country={"ua"}
           enableSearch={false}
@@ -60,7 +61,11 @@ export const InputMaskField: FC<IProps> = ({
             border: "none",
             background: "transparent",
           }}
-          inputStyle={{ background: "transparent", paddingLeft: 0 }}
+          inputStyle={{
+            background: "transparent",
+            paddingLeft: 0,
+            width: "100%",
+          }}
           onChange={(value: string) => {
             onChange(value);
           }}

src/widgets/send-notifications/atoms/button.tsx

@@ -1,14 +1,17 @@
 import React, { FC } from "react";
 import styles from "./styles.module.css";
 import bellSvg from "@/assets/img/Bell.svg";
+import { Tooltip } from "antd";
 
 interface IProps {
   onClick: () => void;
 }
 export const ButtonAtom: FC<IProps> = ({ onClick }) => {
   return (
-    <button className={styles.button} onClick={onClick}>
-      <img src={bellSvg} alt="bell" />
-    </button>
+    <Tooltip title={"Створити сповіщення"} key={"notification"}>
+      <button className={styles.button} onClick={onClick}>
+        <img src={bellSvg} alt="bell" />
+      </button>
+    </Tooltip>
   );
 };

src/widgets/send-notifications/send-notifications.widget.tsx

@@ -60,7 +60,7 @@ export const SendNotificationsWidget: FC<Props> = ({ isOpen, onClose }) => {
           render={({ field: { value, onChange }, fieldState }) => (
             <InputField
               placeholder={""}
-              label={"Заголовок"}
+              label={"Заголовок сповіщення"}
               onChange={onChange}
               value={value}
               error={fieldState?.error?.message}