Merge pull request #331 from onflow/as/conditional-account-state

Conditionally render AccountState
onflow · Sep 16, 2022 · 4df8cec · 4df8cec
2 parents f5d4053 + 74ee7b1
commit 4df8cec
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/src/components/ResourcesBar.tsx b/src/components/ResourcesBar.tsx
@@ -320,25 +320,22 @@ interface ResourcesBarProps {
 }
 
 const ResourcesBar: React.FC<ResourcesBarProps> = ({ resultHeight }) => {
-  const { project, isLoading, selectedResourceAccount } = useProject();
-
+  const { project, selectedResourceAccount } = useProject();
+  const accountState =
+    project?.accounts?.[storageMap[selectedResourceAccount] || 0]?.state;
   return (
     <FeedbackRoot>
-      {isLoading ? (
-        <p>Loading...</p>
+      {selectedResourceAccount && !!accountState ? (
+        <AccountState
+          state={accountState}
+          selectedResourcesAccount={selectedResourceAccount}
+          renderDeployButton={() => {
+            return <FeedbackActions />;
+          }}
+          resultHeight={resultHeight}
+        />
       ) : (
-        selectedResourceAccount && (
-          <AccountState
-            state={
-              project.accounts[storageMap[selectedResourceAccount] || 0].state
-            }
-            selectedResourcesAccount={selectedResourceAccount}
-            renderDeployButton={() => {
-              return <FeedbackActions />;
-            }}
-            resultHeight={resultHeight}
-          />
-        )
+        <p>Loading...</p>
       )}
     </FeedbackRoot>
   );