From 57cd5090ba864fd15b95535c70c415eef45c88f1 Mon Sep 17 00:00:00 2001
From: Brice Theurillat <brice.theurillat@epfl.ch>
Date: Tue, 14 May 2024 17:52:44 +0200
Subject: [PATCH 1/3] Fix error toast digital coin coinbase

---
 .../digital-cash/screens/SendReceive/SendReceive.tsx       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx b/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
index d0900ac71e..5ac3322315 100644
--- a/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
+++ b/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
@@ -317,6 +317,10 @@ export const SendReceiveHeaderRight = () => {
     }
   }, [popToken]);
 
+  if (isCoinbase) {
+    return null;
+  }
+
   if (serializedPopToken === null) {
     toast.show(STRINGS.digital_cash_error_rollcall_not_defined, {
       type: 'warning',
@@ -325,9 +329,6 @@ export const SendReceiveHeaderRight = () => {
     });
     return null;
   }
-  if (isCoinbase) {
-    return null;
-  }
 
   return (
     <>

From 35b684b784156ba56228f835e3503e2278a7544b Mon Sep 17 00:00:00 2001
From: Brice Theurillat <brice.theurillat@epfl.ch>
Date: Tue, 14 May 2024 18:07:30 +0200
Subject: [PATCH 2/3] Fix toast digital cash when roll call id defined

---
 .../digital-cash/screens/SendReceive/SendReceive.tsx         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx b/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
index 5ac3322315..f2ded9e7f0 100644
--- a/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
+++ b/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
@@ -321,12 +321,15 @@ export const SendReceiveHeaderRight = () => {
     return null;
   }
 
-  if (serializedPopToken === null) {
+  if (rollCallId === null) {
     toast.show(STRINGS.digital_cash_error_rollcall_not_defined, {
       type: 'warning',
       placement: 'bottom',
       duration: FOUR_SECONDS,
     });
+  }
+
+  if (serializedPopToken === null) {
     return null;
   }
 

From 6905be22e9152de80d7f2b5e99f8cf8ebcc2ff79 Mon Sep 17 00:00:00 2001
From: Brice Theurillat <brice.theurillat@epfl.ch>
Date: Tue, 14 May 2024 18:18:37 +0200
Subject: [PATCH 3/3] Update toast condition

---
 .../features/digital-cash/screens/SendReceive/SendReceive.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx b/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
index f2ded9e7f0..e96591a5b3 100644
--- a/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
+++ b/fe1-web/src/features/digital-cash/screens/SendReceive/SendReceive.tsx
@@ -321,7 +321,7 @@ export const SendReceiveHeaderRight = () => {
     return null;
   }
 
-  if (rollCallId === null) {
+  if (!serializedRollCallId) {
     toast.show(STRINGS.digital_cash_error_rollcall_not_defined, {
       type: 'warning',
       placement: 'bottom',