Merge branch 'version_3.3.17' into AUT-19336-AUT-19584

Autofleet · Apr 10, 2024 · c6aac51 · c6aac51
2 parents 9f68c41 + 61411da
commit c6aac51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/examples/client/Locomotion/src/Components/BusinessAccountText/index.tsx b/examples/client/Locomotion/src/Components/BusinessAccountText/index.tsx
@@ -9,7 +9,7 @@ const BusinessAccountText = ({
   title, subTitle,
 } : BusinessAccountTextProps) => (
   <TitleWithSubTitle>
-    <BoldTitle numberOfLines={1}>{title}</BoldTitle>
+    {title && <BoldTitle numberOfLines={1}>{title}</BoldTitle>}
     <SubTitle numberOfLines={1}>{subTitle}</SubTitle>
   </TitleWithSubTitle>
 );

diff --git a/examples/client/Locomotion/src/context/payments/index.js b/examples/client/Locomotion/src/context/payments/index.js
@@ -201,7 +201,9 @@ const usePayments = () => {
     if (relevantBusinessAccount) {
       return relevantBusinessAccount;
     }
-    return null;
+    // this means the client no longer have access to the business account, or BA was deleted
+    // requires a fallback object to avoid breaking the app
+    return {};
   };
 
   return {