From e3dcded1e669df9de33adcf55a59aa0a745e3b1c Mon Sep 17 00:00:00 2001
From: Elyor Djalilov <elyor.djalilov@onlyoffice.com>
Date: Tue, 5 Dec 2023 13:47:10 +0500
Subject: [PATCH] data import step icons were corrected

---
 .../OnlyofficeWorkspace/Stepper/ImportStep/index.js    |  2 +-
 .../Stepper/SelectFileStep/index.js                    |  5 ++---
 public/images/catalog.old.share.react.svg              |  4 ++++
 public/images/catalog.portfolio.react.svg              |  3 ++-
 public/images/catalog.projects.react.svg               | 10 ++--------
 public/images/catalog.user.solid.react.svg             |  9 +--------
 6 files changed, 12 insertions(+), 21 deletions(-)
 create mode 100644 public/images/catalog.old.share.react.svg

diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/ImportStep/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/ImportStep/index.js
index e463c33f9a..dc5b5fca40 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/ImportStep/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/ImportStep/index.js
@@ -6,7 +6,7 @@ import SaveCancelButtons from "@docspace/components/save-cancel-buttons";
 import AccountsIcon from "PUBLIC_DIR/images/catalog.accounts.react.svg";
 import UserIcon from "PUBLIC_DIR/images/catalog.user.react.svg";
 import UserSolidIcon from "PUBLIC_DIR/images/catalog.user.solid.react.svg";
-import SharedIcon from "PUBLIC_DIR/images/catalog.share.small.react.svg";
+import SharedIcon from "PUBLIC_DIR/images/catalog.old.share.react.svg";
 import RoomsIcon from "PUBLIC_DIR/images/catalog.rooms.react.svg";
 import PortfolioIcon from "PUBLIC_DIR/images/catalog.portfolio.react.svg";
 import ProjectsIcon from "PUBLIC_DIR/images/catalog.projects.react.svg";
diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
index 002b8c4292..be701738af 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
@@ -102,8 +102,6 @@ const SelectFileStep = ({
         clearInterval(uploadInterval.current);
         setUsers(res.parseResult);
         setShowReminder(true);
-      } else {
-        setIsFileError(false);
       }
     }, 1000);
   };
@@ -131,8 +129,9 @@ const SelectFileStep = ({
   };
 
   const onSelectFile = (file) => {
-    setIsFileLoading(true);
     setProgress(0);
+    setIsFileLoading(true);
+    setIsFileError(false);
     try {
       onUploadFile(file);
     } catch (error) {
diff --git a/public/images/catalog.old.share.react.svg b/public/images/catalog.old.share.react.svg
new file mode 100644
index 0000000000..a1cf9b31c3
--- /dev/null
+++ b/public/images/catalog.old.share.react.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 5V2C10.0826 2 7.28473 3.15893 5.22183 5.22183C3.15893 7.28473 2 10.0826 2 13H5C5 10.8783 5.84285 8.84344 7.34315 7.34315C8.84344 5.84285 10.8783 5 13 5Z" fill="#787D82"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 7C11.4087 7 9.88258 7.63214 8.75736 8.75736C7.63214 9.88258 7 11.4087 7 13H13V7Z" fill="#787D82"/>
+</svg>
diff --git a/public/images/catalog.portfolio.react.svg b/public/images/catalog.portfolio.react.svg
index 985047d068..7ec5ac33ea 100644
--- a/public/images/catalog.portfolio.react.svg
+++ b/public/images/catalog.portfolio.react.svg
@@ -1,3 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 1H9.5C10.3284 1 11 1.67157 11 2.5V3H14C15.1046 3 16 3.89543 16 5V7H10V6H6V7H0V5C0 3.89543 0.895431 3 2 3H5V2.5C5 1.67157 5.67157 1 6.5 1ZM6 9V8H1V12C1 13.1046 1.89543 14 3 14H13C14.1046 14 15 13.1046 15 12V8H10V9C10 10.1046 9.10457 11 8 11C6.89543 11 6 10.1046 6 9ZM9 7H7V9C7 9.55228 7.44772 10 8 10C8.55228 10 9 9.55228 9 9V7Z" fill="#657077"/>
+<path d="M9 9H7V8H2V12C2 12.2652 2.10536 12.5196 2.29289 12.7071C2.48043 12.8946 2.73478 13 3 13H13C13.2652 13 13.5196 12.8946 13.7071 12.7071C13.8946 12.5196 14 12.2652 14 12V8H9V9Z" fill="#787D82"/>
+<path d="M13 4H12V3C12 2.73478 11.8946 2.48043 11.7071 2.29289C11.5196 2.10536 11.2652 2 11 2H5C4.73478 2 4.48043 2.10536 4.29289 2.29289C4.10536 2.48043 4 2.73478 4 3V4H3C2.73478 4 2.48043 4.10536 2.29289 4.29289C2.10536 4.48043 2 4.73478 2 5V7H14V5C14 4.73478 13.8946 4.48043 13.7071 4.29289C13.5196 4.10536 13.2652 4 13 4ZM11 4H5V3H11V4Z" fill="#787D82"/>
 </svg>
diff --git a/public/images/catalog.projects.react.svg b/public/images/catalog.projects.react.svg
index 7ca528d239..42576faa97 100644
--- a/public/images/catalog.projects.react.svg
+++ b/public/images/catalog.projects.react.svg
@@ -1,10 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_460_8373)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00044 3.77091e-08C6.89618 -0.00021214 5.99905 0.894999 5.99948 2.00078L5.99978 2.76312C4.96153 3.68968 4.67866 5.24714 5.4019 6.49982C5.51596 6.69738 5.74004 6.9886 5.97786 7.28588C6.23515 7.60751 6.56747 8.00794 6.94525 8.45507C7.70162 9.35029 8.65535 10.4505 9.58864 11.5172C10.5226 12.5846 11.4389 13.6217 12.1215 14.3918C12.4629 14.7768 12.746 15.0953 12.9437 15.3175L13.1731 15.575L13.2335 15.6428L13.249 15.6602L13.253 15.6646L13.254 15.6657L13.2542 15.666C13.2543 15.6661 13.2543 15.6661 14.0003 15.0002L13.2543 15.6661C13.5305 15.9756 13.9691 16.0824 14.3567 15.9345C14.7443 15.7867 15.0003 15.415 15.0003 15.0002V11.0002C15.0003 10.8157 14.9493 10.6347 14.8528 10.4774L14.0003 11.0002C14.8528 10.4774 14.8528 10.4774 14.8528 10.4774L14.8526 10.4771L14.8521 10.4763L14.85 10.4729L14.8417 10.4593L14.8093 10.4064L14.6857 10.2049L14.2417 9.48024C13.8725 8.87757 13.3762 8.06694 12.8675 7.235C11.8441 5.56115 10.7873 3.8277 10.598 3.49982C10.435 3.2174 10.2322 2.97081 10.0006 2.76363V2C10.0006 0.894825 9.10411 0.000212288 8.00044 3.77091e-08ZM13.0003 11.2823V12.3672C12.4276 11.7194 11.7651 10.9675 11.0938 10.2002C10.1631 9.13642 9.2182 8.04634 8.47296 7.1643C8.09995 6.72281 7.7807 6.33788 7.53962 6.03652C7.4189 5.88562 7.32138 5.76015 7.24808 5.66163C7.2115 5.61246 7.18328 5.57312 7.16245 5.54286C7.14374 5.51567 7.1355 5.50232 7.13406 5.49999L7.13406 5.49998L7.13405 5.49997C7.13379 5.49955 7.13377 5.49951 7.13395 5.49982C6.85781 5.02153 7.02168 4.40994 7.49997 4.1338C7.65924 4.04184 7.83038 3.9993 7.99922 3.99949C8.17499 3.99969 8.34892 4.04633 8.5012 4.13412C8.64734 4.21837 8.77413 4.3407 8.866 4.49982C9.07178 4.85625 10.1491 6.62298 11.1612 8.27825C11.6702 9.11086 12.1669 9.92202 12.5363 10.525L12.9806 11.2501L13.0003 11.2823ZM4.53553 7.00005C4.29843 6.58939 4.14243 6.15415 4.06255 5.7129C3.76707 6.19738 3.44836 6.71914 3.13283 7.23523C2.62418 8.06717 2.12785 8.8778 1.75865 9.48047L1.31462 10.2051L1.19107 10.4066L1.15862 10.4596L1.15032 10.4731L1.14822 10.4765L1.1477 10.4774L1.14757 10.4776C1.14754 10.4776 1.14753 10.4777 2 11.0004L1.14753 10.4777C1.05106 10.635 1 10.8159 1 11.0004V15.0004C1 15.4152 1.25608 15.787 1.64364 15.9348C2.03121 16.0826 2.4698 15.9758 2.74602 15.6663L2 15.0004C2.74602 15.6663 2.74606 15.6663 2.74612 15.6662L2.74638 15.6659L2.74738 15.6648L2.75134 15.6604L2.76686 15.643L2.82725 15.5753L3.05661 15.3177C3.25438 15.0955 3.53745 14.7771 3.87882 14.392C4.56145 13.622 5.47776 12.5849 6.4117 11.5174C6.72107 11.1638 7.03268 10.8066 7.33861 10.4543C6.9254 9.97557 6.53237 9.5165 6.18105 9.10069L6.02539 8.91604C5.65948 9.33821 5.28185 9.77148 4.9065 10.2005C4.23521 10.9677 3.57271 11.7196 3 12.3675L3 11.2826L3.01978 11.2503L3.46408 10.5252C3.83346 9.92225 4.33013 9.11109 4.83918 8.27848L5.12152 7.81655C4.91184 7.55232 4.67738 7.24574 4.53553 7.00005Z" fill="#657077"/>
-</g>
-<defs>
-<clipPath id="clip0_460_8373">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.15399 3.64743C9.51984 3.9919 9.77295 4.43901 9.88 4.93L13 13V15L11 14L5.84998 7.37C5.47736 7.06084 5.20337 6.64935 5.06183 6.18631C4.92029 5.72326 4.91736 5.22891 5.05347 4.76424C5.18958 4.29957 5.45874 3.8849 5.82776 3.5714C6.19672 3.25789 6.64941 3.05926 7.13 3H7V1H8V3H7.82996C8.32654 3.07727 8.78809 3.30297 9.15399 3.64743ZM6.90363 6.34786C7.08276 6.457 7.29047 6.50999 7.5 6.5C7.63562 6.50017 7.7699 6.47274 7.89459 6.41939C8.01929 6.36604 8.13184 6.28788 8.2254 6.18966C8.31891 6.09144 8.39148 5.97521 8.43872 5.84806C8.4859 5.7209 8.50677 5.58547 8.5 5.45C8.49976 5.24025 8.43671 5.03538 8.31897 4.86179C8.20123 4.6882 8.03418 4.55386 7.83942 4.47607C7.64459 4.39828 7.43097 4.38061 7.22607 4.42535C7.02112 4.47008 6.83429 4.57517 6.68964 4.72705C6.54498 4.87894 6.44916 5.07067 6.41443 5.27753C6.37976 5.4844 6.40784 5.69691 6.495 5.88767C6.58221 6.07844 6.72455 6.23872 6.90363 6.34786Z" fill="#787D82"/>
+<path d="M2.02002 14.99L2 13.05L4.51001 6.72L6.96997 10.41L3.97998 13.98L2.02002 14.99Z" fill="#787D82"/>
 </svg>
diff --git a/public/images/catalog.user.solid.react.svg b/public/images/catalog.user.solid.react.svg
index 946125a39f..02b816728a 100644
--- a/public/images/catalog.user.solid.react.svg
+++ b/public/images/catalog.user.solid.react.svg
@@ -1,10 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_460_8104)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99986 7.99994C9.99986 7.99994 10.9999 5.18818 10.9999 2.96465C10.9994 1.32721 9.6719 3.27366e-05 8.03446 5.57118e-10H7.96456C6.32721 -3.13999e-05 4.99986 1.3273 4.99986 2.96465C4.99986 5.18818 5.99986 7.99994 7.99986 7.99994ZM1.07832 15.0055C1.34926 12.9127 2.3783 9 5.00004 9C5.18306 9 5.43306 9.13397 5.75004 9.30385C6.29908 9.59808 7.04908 10 8.00004 10C8.95069 10 9.70051 9.59815 10.2495 9.30392C10.5667 9.1339 10.8169 8.99982 11 9C13.6217 9.00252 14.6508 12.9133 14.9217 15.0055C14.9927 15.5532 14.5523 16 14 16H2.00004C1.44776 16 1.0074 15.5532 1.07832 15.0055Z" fill="#657077"/>
-</g>
-<defs>
-<clipPath id="clip0_460_8104">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 10V8.5C10.2262 8.41048 10.4316 8.27557 10.6036 8.10357C10.7756 7.93158 10.9105 7.72616 11 7.5V4.5C11 3.5 10 2 9 2H7C6 2 5 3.5 5 4.5V7.5C5.08952 7.72616 5.22443 7.93158 5.39643 8.10357C5.56842 8.27557 5.77384 8.41048 6 8.5V10C6 10 2 12 2 13V14H14V13C14 12 10 10 10 10Z" fill="#787D82"/>
 </svg>