react-app: Prevent throwing error when proposal type is unknown

refs oursky#362
hochiw · Sep 13, 2022 · b9b584b · b9b584b
1 parent d04f706
commit b9b584b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/react-app/src/components/ProposalDetailScreen/ProposalHeader.tsx b/react-app/src/components/ProposalDetailScreen/ProposalHeader.tsx
@@ -160,6 +160,8 @@ const ProposalTypeAndProposer: React.FC<{ proposal: Proposal }> = ({
 }) => {
   const { type, proposerAddress, submitTime } = proposal;
 
+  const typeNameId = getProposalTypeMessage(type);
+
   return (
     <div
       className={cn(
@@ -175,7 +177,7 @@ const ProposalTypeAndProposer: React.FC<{ proposal: Proposal }> = ({
         <LocalizedText messageID="ProposalDetail.proposalType" />
       </p>
       <p className={cn("text-sm", "mb-4")}>
-        <LocalizedText messageID={getProposalTypeMessage(type)} />
+        {typeNameId !== null ? <LocalizedText messageID={typeNameId} /> : type}
       </p>
       <p className={cn("text-sm", "text-app-lightgreen", "mb-1")}>
         <LocalizedText messageID="ProposalDetail.publishedBy" />

diff --git a/react-app/src/components/proposals/ProposalCard.tsx b/react-app/src/components/proposals/ProposalCard.tsx
@@ -50,6 +50,11 @@ const ProposalCard: React.FC<ProposalCardProps> = (props) => {
     });
   }, [proposal]);
 
+  const proposalTypeNameId = useMemo(
+    () => getProposalTypeMessage(proposal.type),
+    [proposal]
+  );
+
   return (
     <div
       className={cn(
@@ -86,7 +91,11 @@ const ProposalCard: React.FC<ProposalCardProps> = (props) => {
             "text-app-darkgrey"
           )}
         >
-          <LocalizedText messageID={getProposalTypeMessage(proposal.type)} />
+          {proposalTypeNameId !== null ? (
+            <LocalizedText messageID={proposalTypeNameId} />
+          ) : (
+            proposal.type
+          )}
         </span>
         <h1
           className={cn(

diff --git a/react-app/src/components/proposals/utils.tsx b/react-app/src/components/proposals/utils.tsx
@@ -27,7 +27,7 @@ export function getProposalStatusBadgeConfig(
   }
 }
 
-export function getProposalTypeMessage(type: ProposalType): MessageID {
+export function getProposalTypeMessage(type: string): MessageID | null {
   switch (type) {
     case ProposalType.Text:
       return "ProposalScreen.proposalType.text";
@@ -40,7 +40,7 @@ export function getProposalTypeMessage(type: ProposalType): MessageID {
     case ProposalType.CancelSoftwareUpgrade:
       return "ProposalScreen.proposalType.cancelSoftwareUpgrade";
     default:
-      throw new Error("Unknown proposal type");
+      return null;
   }
 }