From 33c979783d46389d9edf0a9273dea1e82bbd023e Mon Sep 17 00:00:00 2001
From: Daniel Valdivia <hola@danielvaldivia.com>
Date: Wed, 30 Dec 2020 00:00:47 -0800
Subject: [PATCH] Consolidate New Prompt Credentials - Subnet #1441 (#537)

---
 portal-ui/src/screens/Console/Account/Account.tsx         | 8 +++++++-
 .../src/screens/Console/Common/CredentialsPrompt/types.ts | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/portal-ui/src/screens/Console/Account/Account.tsx b/portal-ui/src/screens/Console/Account/Account.tsx
index 2ce845523..c16ac3f44 100644
--- a/portal-ui/src/screens/Console/Account/Account.tsx
+++ b/portal-ui/src/screens/Console/Account/Account.tsx
@@ -138,8 +138,14 @@ const Account = ({ classes }: IServiceAccountsProps) => {
     fetchRecords();
 
     if (res !== null) {
+      const nsa: NewServiceAccount = {
+        console: {
+          accessKey: `${res.accessKey}`,
+          secretKey: `${res.secretKey}`,
+        },
+      };
+      setNewServiceAccount(nsa);
       setShowNewCredentials(true);
-      setNewServiceAccount(res);
     }
   };
 
diff --git a/portal-ui/src/screens/Console/Common/CredentialsPrompt/types.ts b/portal-ui/src/screens/Console/Common/CredentialsPrompt/types.ts
index 7b75e28ab..74216fd10 100644
--- a/portal-ui/src/screens/Console/Common/CredentialsPrompt/types.ts
+++ b/portal-ui/src/screens/Console/Common/CredentialsPrompt/types.ts
@@ -16,6 +16,8 @@
 
 export interface NewServiceAccount {
   console?: ConsoleSA;
+  accessKey?: string;
+  secretKey?: string;
 }
 
 export interface ConsoleSA {