🔥 Transaction modal and studio hotfixes (#43)

* Consider wallet being null in transaction modal * Add missing suspense for studio
Joystream · May 7, 2024 · f3e4554 · f3e4554
1 parent cf8d282
commit f3e4554
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/atlas/src/components/_overlays/TransactionModal/TransactionModal.tsx b/packages/atlas/src/components/_overlays/TransactionModal/TransactionModal.tsx
@@ -90,7 +90,7 @@ export const TransactionModal: FC<TransactionModalProps> = ({ onClose, status, c
   }, [decrementOverlaysOpenCount])
 
   // @ts-ignore different wallet types before lib integration
-  const walletLogo = wallet?.logo ? wallet.logo.src : wallet.metadata.logoUrl || null
+  const walletLogo = wallet?.logo ? wallet.logo.src : wallet?.metadata.logoUrl || null
 
   return (
     <StyledModal show={!!stepDetails} className={className}>

diff --git a/packages/atlas/src/views/studio/StudioLayout.tsx b/packages/atlas/src/views/studio/StudioLayout.tsx
@@ -260,7 +260,15 @@ const _StudioLayout = () => {
               </Routes>
             </Suspense>
           </MainContainer>
-          {channelSet && <VideoWorkspace />}
+          <Suspense
+            fallback={
+              <LoadingStudioContainer>
+                <Spinner size="large" />
+              </LoadingStudioContainer>
+            }
+          >
+            {channelSet && <VideoWorkspace />}
+          </Suspense>
         </>
       )}
     </>