{
setOrganizationValue={setOrganizationValue}
/>
)}
- {isError && !showCreateForm && !showCredential && }
+ {(!organization || isError) && loading && }
+ {isError && !showCreateForm && !showCredential && !organization && }
{showCredential && !showCreateForm && }
{redirectToBeta && }
- {!showCreateForm && !organization && !isError && }
-
+ {!showCreateForm && !organization && !isError && !loading && }
>
)
}
diff --git a/packages/gatsby-theme-aio/src/components/GetCredential/Loading.js b/packages/gatsby-theme-aio/src/components/GetCredential/Loading.js
index 276a3e3841..399738eee7 100644
--- a/packages/gatsby-theme-aio/src/components/GetCredential/Loading.js
+++ b/packages/gatsby-theme-aio/src/components/GetCredential/Loading.js
@@ -1,13 +1,14 @@
-import React, {useEffect, useRef} from 'react';
+import React, { useEffect, useRef } from 'react';
import { css } from "@emotion/react";
const Loading = ({
credentials,
- downloadStatus
+ downloadStatus,
+ isCreateCredential
}) => {
const divRef = useRef(null);
- useEffect(() =>{
- if(divRef.current){
+ useEffect(() => {
+ if (divRef.current) {
divRef.current.scrollIntoView({
behavior: 'smooth',
block: 'center',
@@ -15,9 +16,10 @@ const Loading = ({
});
}
}, [])
+
return (
<>
- {credentials?.heading && {credentials?.heading}
}
+ {credentials?.title && {credentials?.title}
}
- Creating credentials...
+ {isCreateCredential && "Creating credentials..."}
{downloadStatus &&