Merge pull request #297 from lidofinance/feature/si-2520-sync-and-alter-tier-for-abandoned-vault

Abandoned vault

Author: ev-d

features/settings/tier/components/alter-tier-info/alter-tier-info.tsx

@@ -2,11 +2,11 @@ import { useState, useCallback } from 'react';
 import { Text } from '@lidofinance/lido-ui';
 
 import {
-  useVault,
   useVaultConfirmingRoles,
   useVaultPermission,
   useVaultTierInfo,
 } from 'modules/vaults';
+import { useDisableForm } from 'shared/hook-form';
 import { ReactComponent as WarningTriangle } from 'assets/icons/warning-triangle.svg';
 import { isNumber } from 'utils';
 
@@ -27,12 +27,12 @@ import {
 
 export const AlterTierInfo = () => {
   const [showModal, setModalVisibility] = useState(false);
-  const { activeVault } = useVault();
   const { data: vaultTierInfo, isLoading } = useVaultTierInfo();
   const { data } = useAlterTier();
   const { hasChanges, alterTierList, id, tierName } = data ?? {};
   const { hasAdmin, isNodeOperator } = useVaultConfirmingRoles();
   const { hasPermission } = useVaultPermission('vaultConfiguration');
+  const disable = useDisableForm();
 
   const closeModal = useCallback(() => setModalVisibility(false), []);
   const openModal = useCallback(() => setModalVisibility(true), []);
@@ -42,7 +42,7 @@ export const AlterTierInfo = () => {
     !hasChanges ||
     !(hasAdmin || isNodeOperator || hasPermission) ||
     !isNumber(id) ||
-    activeVault?.isPendingConnect ||
+    disable ||
     (extendLastProposal?.tierId === BigInt(id) &&
       extendLastProposal.functionName === 'syncTier')
   ) {

features/settings/tier/components/voting-request/voting-request.tsx

@@ -7,6 +7,7 @@ import {
   vaultTexts,
   useVaultPermission,
 } from 'modules/vaults';
+import { useDisableForm } from 'shared/hook-form';
 
 import { SectionContainer } from 'features/settings/shared/components';
 import { Title, RequestAdditionalInfo } from 'features/settings/tier/shared';
@@ -30,7 +31,9 @@ export const VotingRequest = () => {
   const { hasPermission: hasVaultConfigurationPermission } =
     useVaultPermission('vaultConfiguration');
   const tierVoting = useTierVoting();
-  if (!tierVoting) {
+  const disable = useDisableForm();
+
+  if (!tierVoting || disable) {
     return null;
   }
 

package.json

@@ -45,7 +45,7 @@
     "cors": "^2.8.5",
     "fs-extra": "^10.1.0",
     "js-cookie": "^3.0.1",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "memory-cache": "^0.2.0",
     "ms": "^2.1.3",
     "next": "^12.3.4",
@@ -81,7 +81,7 @@
     "@types/jest": "28.1.6",
     "@types/js-cookie": "^3.0.0",
     "@types/json-bigint": "^1.0.4",
-    "@types/lodash": "^4.14.186",
+    "@types/lodash": "^4.17.24",
     "@types/memory-cache": "0.2.2",
     "@types/ms": "^0.7.31",
     "@types/node": "^18.6.1",

yarn.lock

@@ -4180,10 +4180,10 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.14.186":
-  version "4.14.202"
-  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz"
-  integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==
+"@types/lodash@^4.17.24":
+  version "4.17.24"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.24.tgz#4ae334fc62c0e915ca8ed8e35dcc6d4eeb29215f"
+  integrity sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==
 
 "@types/memory-cache@0.2.2":
   version "0.2.2"
@@ -9064,14 +9064,14 @@ lodash.upperfirst@^4.3.1:
   integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
 
 lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.21:
-  version "4.17.21"
+  version "4.18.1"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-lodash@^4.17.23:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
+lodash@^4.18.1:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 log-update@^5.0.1:
   version "5.0.1"