From d0ab2a572cd69acb337955b86c924fcacccfc4e6 Mon Sep 17 00:00:00 2001
From: ianedwards <ianedwards559@gmail.com>
Date: Fri, 29 Sep 2023 15:38:43 -0400
Subject: [PATCH] disable msg nit and fix rendering bug (#3687)

---
 .../home/app-dashboard/app-view/AppDataContainer.tsx |  3 ++-
 .../home/app-dashboard/app-view/tabs/Environment.tsx |  2 +-
 .../home/app-dashboard/app-view/tabs/Overview.tsx    |  2 +-
 .../services-settings/tabs/Resources.tsx             | 12 ++++++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dashboard/src/main/home/app-dashboard/app-view/AppDataContainer.tsx b/dashboard/src/main/home/app-dashboard/app-view/AppDataContainer.tsx
index 3a05d12f23..f7049b0eba 100644
--- a/dashboard/src/main/home/app-dashboard/app-view/AppDataContainer.tsx
+++ b/dashboard/src/main/home/app-dashboard/app-view/AppDataContainer.tsx
@@ -314,6 +314,7 @@ const AppDataContainer: React.FC<AppDataContainerProps> = ({ tabParam }) => {
     });
   }, [
     servicesFromYaml,
+    currentTab,
     latestProto,
     previewRevision,
     latestRevision.revision_number,
@@ -347,7 +348,7 @@ const AppDataContainer: React.FC<AppDataContainerProps> = ({ tabParam }) => {
                     latestRevision.status === "CREATED" ||
                     latestRevision.status === "AWAITING_BUILD_ARTIFACT"
                   }
-                  disabledTooltipMessage="Please wait for the build to complete before updating the app"
+                  disabledTooltipMessage="Please wait for the deploy to complete before updating the app"
                 >
                   <Icon src={save} height={"13px"} />
                   <Spacer inline x={0.5} />
diff --git a/dashboard/src/main/home/app-dashboard/app-view/tabs/Environment.tsx b/dashboard/src/main/home/app-dashboard/app-view/tabs/Environment.tsx
index 6a0804d987..038cacceb8 100644
--- a/dashboard/src/main/home/app-dashboard/app-view/tabs/Environment.tsx
+++ b/dashboard/src/main/home/app-dashboard/app-view/tabs/Environment.tsx
@@ -87,7 +87,7 @@ const Environment: React.FC<Props> = ({ latestSource }) => {
           latestRevision.status === "CREATED" ||
           latestRevision.status === "AWAITING_BUILD_ARTIFACT"
         }
-        disabledTooltipMessage="Please wait for the build to complete before updating environment variables"
+        disabledTooltipMessage="Please wait for the deploy to complete before updating environment variables"
       >
         Update app
       </Button>
diff --git a/dashboard/src/main/home/app-dashboard/app-view/tabs/Overview.tsx b/dashboard/src/main/home/app-dashboard/app-view/tabs/Overview.tsx
index 0d924b959e..15d0dff0a8 100644
--- a/dashboard/src/main/home/app-dashboard/app-view/tabs/Overview.tsx
+++ b/dashboard/src/main/home/app-dashboard/app-view/tabs/Overview.tsx
@@ -84,7 +84,7 @@ const Overview: React.FC = () => {
           latestRevision.status === "CREATED" ||
           latestRevision.status === "AWAITING_BUILD_ARTIFACT"
         }
-        disabledTooltipMessage="Please wait for the build to complete before updating services"
+        disabledTooltipMessage="Please wait for the deploy to complete before updating services"
       >
         Update app
       </Button>
diff --git a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Resources.tsx b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Resources.tsx
index 1049964255..6c28082001 100644
--- a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Resources.tsx
+++ b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Resources.tsx
@@ -34,7 +34,11 @@ const Resources: React.FC<ResourcesProps> = ({
     <>
       <Spacer y={1} />
       <Controller
-        name={isPredeploy ? `app.predeploy.${index}.cpuCores` : `app.services.${index}.cpuCores`}
+        name={
+          isPredeploy
+            ? `app.predeploy.${index}.cpuCores`
+            : `app.services.${index}.cpuCores`
+        }
         control={control}
         render={({ field: { value, onChange } }) => (
           <InputSlider
@@ -60,7 +64,11 @@ const Resources: React.FC<ResourcesProps> = ({
       />
       <Spacer y={1} />
       <Controller
-        name={isPredeploy ? `app.predeploy.${index}.ramMegabytes` : `app.services.${index}.ramMegabytes`}
+        name={
+          isPredeploy
+            ? `app.predeploy.${index}.ramMegabytes`
+            : `app.services.${index}.ramMegabytes`
+        }
         control={control}
         render={({ field: { value, onChange } }) => (
           <InputSlider