Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…

…recovery-phrase
input-output-hk · Apr 7, 2021 · 27b7d3f · 27b7d3f
2 parents b89f645 + cd26720
commit 27b7d3f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ Changelog
 - Updates Catalyst Fund4 dates ([PR 2495](https://github.com/input-output-hk/daedalus/pull/2495))
 - Updated `cardano-wallet` to revision `7df30796` ([PR 2495](https://github.com/input-output-hk/daedalus/pull/2495))
 
+### Fixes
+
+- Handle empty strings in transaction metadata correctly ([PR 2503](https://github.com/input-output-hk/daedalus/pull/2503)) 
+
 ## 4.0.4
 
 ### Features

diff --git a/source/renderer/app/components/wallet/transactions/metadata/TransactionMetadataView.js b/source/renderer/app/components/wallet/transactions/metadata/TransactionMetadataView.js
@@ -12,7 +12,7 @@ function flattenMetadata(data: MetadataValue) {
   if (data.int) {
     return data.int;
   }
-  if (data.string) {
+  if (data.string != null) {
     return data.string;
   }
   if (data.bytes) {

diff --git a/storybook/stories/_support/utils.js b/storybook/stories/_support/utils.js
@@ -49,7 +49,8 @@ export const EXAMPLE_METADATA = JSONBigInt.parse(`{
           { "int": 42 },
           { "string": "1337" },
           { "list": [
-            { "string": "nested list" }
+            { "string": "nested list" },
+            { "string": "" }
           ]}
         ]
       },