From 671fc3ea78c62adf1d625dd6cf38339de12dab92 Mon Sep 17 00:00:00 2001
From: Omer Gery <68545675+OmerGery@users.noreply.github.com>
Date: Tue, 19 Mar 2024 11:38:26 +0200
Subject: [PATCH 1/3] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4f8cb0b89..b80dd222e 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 description: Democratizing mobility.
 ---
 
+
 # Locomotion
 
 ## What is Locomotion?

From 61bc53e6860e5f766c47584d339cd47fabc25849 Mon Sep 17 00:00:00 2001
From: Omer Gery <68545675+OmerGery@users.noreply.github.com>
Date: Tue, 19 Mar 2024 11:38:56 +0200
Subject: [PATCH 2/3] Revert "Update README.md"

This reverts commit 671fc3ea78c62adf1d625dd6cf38339de12dab92.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index b80dd222e..4f8cb0b89 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 description: Democratizing mobility.
 ---
 
-
 # Locomotion
 
 ## What is Locomotion?

From 63d0dfaab024e777707572068030ea2be0ea9d9c Mon Sep 17 00:00:00 2001
From: Omer Gery <68545675+OmerGery@users.noreply.github.com>
Date: Tue, 19 Mar 2024 12:21:54 +0200
Subject: [PATCH 3/3] fix crash on deleted BA ride history (#818)

---
 .../Locomotion/src/Components/BusinessAccountText/index.tsx   | 2 +-
 examples/client/Locomotion/src/context/payments/index.js      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/client/Locomotion/src/Components/BusinessAccountText/index.tsx b/examples/client/Locomotion/src/Components/BusinessAccountText/index.tsx
index 01d3cd986..a4b31253f 100644
--- 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
index 426aea373..1e184f37e 100644
--- 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 {