Merge branch 'develop' into feature/user-quota

packages/client/src/pages/Home/InfoPanel/Body/views/Share/ExpiredComboBox.js

@@ -105,6 +105,7 @@ const ExpiredComboBox = ({ link, changeExpirationOption, isDisabled }) => {
             fontSize="12px"
             fontWeight={400}
             isDisabled={isDisabled}
+            directionY={"both"}
           >
             {{ date }}
           </LinkWithDropdown>

packages/client/src/pages/Home/InfoPanel/Body/views/Share/LinkRow.js

@@ -4,7 +4,6 @@ import PeopleIcon from "PUBLIC_DIR/images/people.react.svg?url";
 import CopyIcon from "PUBLIC_DIR/images/copy.react.svg?url";
 
 import { useTranslation } from "react-i18next";
-import { isMobileOnly } from "react-device-detect";
 import copy from "copy-to-clipboard";
 
 import { Avatar } from "@docspace/shared/components/avatar";
@@ -95,7 +94,6 @@ const LinkRow = ({
                   showDisabledItems={true}
                   size="content"
                   fillIcon={false}
-                  withBlur={isMobileOnly}
                   modernView={true}
                   isDisabled={isExpiredLink || isLoaded}
                 />
@@ -123,7 +121,6 @@ const LinkRow = ({
                   showDisabledItems={true}
                   size="content"
                   fillIcon={true}
-                  withBlur={isMobileOnly}
                   modernView={true}
                   type="onlyIcon"
                   isDisabled={isExpiredLink || isLoaded}

packages/client/src/pages/Home/Section/Filter/index.js

@@ -2208,7 +2208,6 @@ const SectionFilterContent = ({
       placeholder={t("Common:Search")}
       view={t("Common:View")}
       isFavoritesFolder={isFavoritesFolder}
-      isRecentTab={isRecentTab}
       isPersonalRoom={isPersonalRoom}
       isRooms={isRooms}
       removeSelectedItem={removeSelectedItem}

packages/client/src/pages/Wizard/index.js

@@ -214,33 +214,27 @@ const Wizard = (props) => {
   };
 
   const validateFields = () => {
+    let anyError = false;
     const emptyEmail = email.trim() === "";
     const emptyPassword = password.trim() === "";
 
-    console.log(emptyEmail, email);
-
     if (emptyEmail || emptyPassword) {
       emptyEmail && setHasErrorEmail(true);
       emptyPassword && setHasErrorPass(true);
+      anyError = true;
     }
 
     if (!agreeTerms) {
       setHasErrorAgree(true);
+      anyError = true;
     }
 
-    if (isLicenseRequired && !licenseUpload) {
+    if (isLicenseRequired && licenseUpload === null) {
       setHasErrorLicense(true);
+      anyError = true;
     }
 
-    if (
-      emptyEmail ||
-      emptyPassword ||
-      hasErrorEmail ||
-      hasErrorPass ||
-      !agreeTerms ||
-      (isLicenseRequired && !licenseUpload)
-    )
-      return false;
+    if (anyError || hasErrorEmail || hasErrorPass) return false;
 
     return true;
   };

packages/shared/components/filter/Filter.types.ts

@@ -202,5 +202,4 @@ export interface FilterProps {
   onClearFilter: () => void;
   currentDeviceType: DeviceType;
   userId: string;
-  isRecentTab: boolean;
 }

packages/shared/components/filter/index.tsx

@@ -36,7 +36,6 @@ const FilterInput = React.memo(
     selectorLabel,
     clearAll,
 
-    isRecentTab,
     removeSelectedItem,
 
     isRooms,
@@ -194,19 +193,20 @@ const FilterInput = React.memo(
             title={sortByTitle}
           />
 
-          {((viewSettings &&
+          {viewSettings &&
             currentDeviceType === DeviceType.desktop &&
-            viewSelectorVisible) ||
-            isRecentTab) && (
-            <ViewSelector
-              id={viewAs === "tile" ? "view-switch--row" : "view-switch--tile"}
-              style={styleViewSelector}
-              viewAs={viewAs === "table" ? "row" : viewAs}
-              viewSettings={viewSettings}
-              onChangeView={onChangeViewAs}
-              isFilter
-            />
-          )}
+            viewSelectorVisible && (
+              <ViewSelector
+                id={
+                  viewAs === "tile" ? "view-switch--row" : "view-switch--tile"
+                }
+                style={styleViewSelector}
+                viewAs={viewAs === "table" ? "row" : viewAs}
+                viewSettings={viewSettings}
+                onChangeView={onChangeViewAs}
+                isFilter
+              />
+            )}
         </div>
         {selectedItems && selectedItems.length > 0 && (
           <div className="filter-input_selected-row">

packages/shared/package.json

@@ -41,7 +41,6 @@
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
     "prop-types": "^15.8.1",
-    "punycode": "^2.3.0",
     "query-string": "7.1.3",
     "rc-tree": "^5.7.3",
     "re-resizable": "^6.9.9",
@@ -119,7 +118,6 @@
     "@types/lodash": "^4.14.202",
     "@types/luxon": "^3.3.1",
     "@types/node": "^20.9.4",
-    "@types/punycode": "^2.1.3",
     "@types/react": "^18.2.53",
     "@types/react-avatar-editor": "^13.0.2",
     "@types/react-transition-group": "^4.4.9",

packages/shared/utils/email/email.ts

@@ -3,7 +3,6 @@
 /* eslint-disable no-useless-escape */
 /* eslint-disable no-control-regex */
 import emailAddresses, { ParsedGroup, ParsedMailbox } from "email-addresses";
-import punycode from "punycode";
 
 import { ErrorKeys, ParseErrorTypes } from "../../enums";
 
@@ -206,7 +205,7 @@ const checkErrors = (
   if (
     !options.allowDomainPunycode &&
     "domain" in parsedAddress &&
-    !/^[\x00-\x7F]+$/.test(punycode.toUnicode(parsedAddress.domain))
+    /^xn--/.test(parsedAddress.domain)
   ) {
     errors.push({
       message: "Punycode domains are not supported",
@@ -220,7 +219,7 @@ const checkErrors = (
     !options.allowLocalPartPunycode &&
     "local" in parsedAddress &&
     parsedAddress.local.length > 0 &&
-    !/^[\x00-\x7F]+$/.test(punycode.toUnicode(parsedAddress.local))
+    /^xn--/.test(parsedAddress.local)
   ) {
     errors.push({
       message: "Punycode local part are not supported",
@@ -359,3 +358,4 @@ export const isEqualEmail = (email1: string, email2: string) => {
 
   return parsed1.email === parsed2.email;
 };
+