Merge pull request #500 from joincivil/am9u/dapp/fix-legacy-charter-r…

…endering DApp: Render legacy charter format
joincivil · Oct 8, 2018 · 6e764e9 · 6e764e9
2 parents a5b02a5 + 799402d
commit 6e764e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/dapp/src/components/listing/ListingCharter.tsx b/packages/dapp/src/components/listing/ListingCharter.tsx
@@ -13,7 +13,8 @@ class ListingCharter extends React.Component<ListingCharterProps> {
     if (this.props.newsroom && this.props.newsroom.data.charter) {
       let newsroomCharter;
       try {
-        newsroomCharter = JSON.parse(this.props.newsroom.data.charter.content.toString()).charter;
+        // TODO(jon): This is a temporary patch to handle the older charter format. It's needed while we're in transition to the newer schema and should be updated once the dapp is updated to properly handle the new charter
+        newsroomCharter = (this.props.newsroom.data.charter.content as any).charter;
       } catch (ex) {
         console.error("charter not formatted correctly");
       }

diff --git a/packages/dapp/src/components/listing/ListingHeader.tsx b/packages/dapp/src/components/listing/ListingHeader.tsx
@@ -19,7 +19,8 @@ class ListingHeader extends React.Component<ListingHeaderProps> {
     let newsroomDescription = "";
     if (this.props.newsroom.data.charter) {
       try {
-        newsroomDescription = JSON.parse(this.props.newsroom.data.charter.content.toString()).desc;
+        // TODO(jon): This is a temporary patch to handle the older charter format. It's needed while we're in transition to the newer schema and should be updated once the dapp is updated to properly handle the new charter
+        newsroomDescription = (this.props.newsroom.data.charter.content as any).desc;
       } catch (ex) {
         console.error("charter not formatted correctly");
       }

diff --git a/packages/dapp/src/components/listinglist/ListingListItem.tsx b/packages/dapp/src/components/listinglist/ListingListItem.tsx
@@ -45,7 +45,8 @@ class ListingListItemComponent extends React.Component<
     let description = "";
     if (newsroom!.wrapper.data.charter) {
       try {
-        description = JSON.parse(newsroom!.wrapper.data.charter!.content.toString()).desc;
+        // TODO(jon): This is a temporary patch to handle the older charter format. It's needed while we're in transition to the newer schema and should be updated once the dapp is updated to properly handle the new charter
+        description = (newsroom!.wrapper.data.charter!.content as any).desc;
       } catch (ex) {
         console.error("charter not formatted correctly");
       }