Merge branch 'nico/new-onboarding-flow' of https://github.com/porter-dev/porter into nico/new-onboarding-flow

mergin

dashboard/src/main/home/onboarding/steps/ConnectRegistry/forms/_AWSRegistryForm.tsx

@@ -187,7 +187,7 @@ export const CredentialsForm: React.FC<{
         <Br />
         <Flex>
           {lastConnectedAccount && (
-            <SaveButton
+            <CancelButton
               text="Cancel"
               disabled={false}
               onClick={() => setShowForm(false)}
@@ -351,6 +351,10 @@ export const TestRegistryConnection: React.FC<{ nextFormStep: () => void }> = ({
   );
 };
 
+const CancelButton = styled(SaveButton)`
+  z-index: 0;
+`;
+
 const Right = styled.div`
   text-align: right;
 `;
@@ -401,6 +405,7 @@ const PreviewRow = styled.div`
 `;
 
 const SubmitButton = styled(SaveButton)`
+  z-index: 0;
   margin-left: ${(props: { disableLeftMargin: boolean }) =>
     props.disableLeftMargin ? "" : "16px"};
 `;

dashboard/src/main/home/onboarding/steps/ProvisionResources/forms/_AWSProvisionerForm.tsx

@@ -205,7 +205,7 @@ export const CredentialsForm: React.FC<{
         <Br />
         <Flex>
           {lastConnectedAccount && (
-            <SaveButton
+            <CancelButton
               text="Cancel"
               disabled={false}
               onClick={() => setShowForm(false)}
@@ -433,6 +433,10 @@ export const SettingsForm: React.FC<{
   );
 };
 
+const CancelButton = styled(SaveButton)`
+  z-index: 0;
+`;
+
 const Right = styled.div`
   text-align: right;
 `;
@@ -443,6 +447,7 @@ const Br = styled.div`
 `;
 
 const SubmitButton = styled(SaveButton)`
+  z-index: 0;
   margin-left: ${(props: { disableLeftMargin: boolean }) =>
     props.disableLeftMargin ? "" : "16px"};
 `;

dashboard/src/main/home/onboarding/steps/ProvisionResources/forms/_GCPProvisionerForm.tsx

@@ -193,6 +193,7 @@ export const CredentialsForm: React.FC<{
           height="100%"
           isRequired={true}
         />
+        <Br />
         <Flex>
           {lastConnectedAccount && (
             <SaveButton
@@ -230,7 +231,8 @@ export const CredentialsForm: React.FC<{
           {lastConnectedAccount?.gcp_sa_email || "n/a"}
         </Flex>
         <Right>
-          Connected at {readableDate(lastConnectedAccount.created_at)}
+          Connected at{" "}
+          {readableDate(lastConnectedAccount.created_at)}
         </Right>
       </PreviewRow>
       <Helper>