From b0c39225db5e72646282248713127aacd790190e Mon Sep 17 00:00:00 2001
From: Rob Holland <rob@temporal.io>
Date: Wed, 2 Mar 2022 07:59:28 +0000
Subject: [PATCH] Show an error key for payloads when remote decoder fails.
 (#439)

* Show an error key for payloads when remote decoder fails.
---
 client/features/data-conversion.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/features/data-conversion.js b/client/features/data-conversion.js
index 658b9601..6c778c2b 100644
--- a/client/features/data-conversion.js
+++ b/client/features/data-conversion.js
@@ -31,10 +31,16 @@ export const convertEventPayloadsWithRemoteEncoder = async (events, endpoint) =>
             }  
           });
         })
+        .catch(() => {
+          payloadsWrapper.payloads.forEach((payload) => {
+            payload.error = "Could not decode payload, remote decoder returned an error."
+          })
+        })
     )
   })
 
-  await Promise.allSettled(requests);
+  // We catch and handle errors above so no error handling needed here.
+  await Promise.all(requests);
 
   return events;
 };