Merge pull request #1003 from ssvlabs/stage

Stage to main
ssvlabs · Jun 25, 2024 · 3c07721 · 3c07721
2 parents 56403a7 + e3e5c41
commit 3c07721
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/app/common/config/config.ts b/src/app/common/config/config.ts
@@ -188,13 +188,19 @@ export const config = {
       ADDRESS: tokenAddress,
       ABI: ABI_VERSION.tokenContract
     },
-    SSV_NETWORK_SETTER: {
-      ADDRESS: setterContractAddress,
-      ABI: ABI_VERSION.setterContract[`${networkId}_${apiVersion}`]
+    get SSV_NETWORK_SETTER() {
+      const { networkId, apiVersion } = getStoredNetwork();
+      return {
+        ADDRESS: setterContractAddress,
+        ABI: ABI_VERSION.setterContract[`${networkId}_${apiVersion}`]
+      };
     },
-    SSV_NETWORK_GETTER: {
-      ADDRESS: getterContractAddress,
-      ABI: ABI_VERSION.getterContract[`${networkId}_${apiVersion}`]
+    get SSV_NETWORK_GETTER() {
+      const { networkId, apiVersion } = getStoredNetwork();
+      return {
+        ADDRESS: getterContractAddress,
+        ABI: ABI_VERSION.getterContract[`${networkId}_${apiVersion}`]
+      };
     },
     SSV_DISTRIBUTION: {
       // ADDRESS: contract,

diff --git a/src/app/components/applications/SSV/OperatorAccessSettingsV2/PermissionSettingsDashboard.tsx b/src/app/components/applications/SSV/OperatorAccessSettingsV2/PermissionSettingsDashboard.tsx
@@ -39,7 +39,7 @@ const PermissionSettingsDashboard = () => {
         />
         <PermissionSettingsItem
           title="Operator Status"
-          description={'Switch between public and private modes for operator access control'}
+          description={'Switch between public and private modes for operator access control.'}
           route={config.routes.SSV.MY_ACCOUNT.OPERATOR.ACCESS_SETTINGS.STATUS}
           addon={<OperatorStatusBadge isPrivate={selectedOperator.is_private} />}
         />
@@ -52,7 +52,7 @@ const PermissionSettingsDashboard = () => {
         <PermissionSettingsItem
           className="pb-8"
           title="External Contract"
-          description="Manage whitelisted addresses through an external contract"
+          description="Manage whitelisted addresses through an external contract."
           addon={<ActiveBadge isActive={hasWhitelistingContract} />}
           route={config.routes.SSV.MY_ACCOUNT.OPERATOR.ACCESS_SETTINGS.EXTERNAL_CONTRACT}
         />

diff --git a/src/app/components/applications/SSV/OperatorAccessSettingsV2/Status.tsx b/src/app/components/applications/SSV/OperatorAccessSettingsV2/Status.tsx
@@ -29,7 +29,7 @@ const OperatorStatus = () => {
                   <span className="font-bold">Public mode</span> - Any validator can register with the operator.
                 </li>
                 <li>
-                  <span className="font-bold">Private mode</span> Only authorized addresses can register.
+                  <span className="font-bold">Private mode</span> - Only whitelisted addresses can register.
                 </li>
               </ul>
               <p className="font-medium text-sm pt-3">
@@ -43,7 +43,7 @@ const OperatorStatus = () => {
           </div>
           {isFeeZero && operator.is_private && (
             <Alert variant="error">
-              <AlertDescription>Switching the operator to public when the fee is set to 0 is not possible. </AlertDescription>
+              <AlertDescription>You cannot switch your operator to public mode when you have a set fee of 0.</AlertDescription>
             </Alert>
           )}
           <Button