Improve invalid script handling (aragon#885)

* Description takes precedence in voting card * Reorder description and metadata (question) * Do not nullify metadata
ConsiderItDone · Jun 6, 2019 · 2f9859e · 2f9859e
1 parent 3dbf790
commit 2f9859e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/apps/voting/app/src/components/VotePanel.js b/apps/voting/app/src/components/VotePanel.js
@@ -111,6 +111,16 @@ const VotePanelContent = React.memo(
           </div>
         </SidePanelSplit>
         <Part>
+          {description && (
+            <React.Fragment>
+              <h2>
+                <Label>Description</Label>
+              </h2>
+              <p>
+                <VoteText text={description} />
+              </p>
+            </React.Fragment>
+          )}
           {metadata && (
             <React.Fragment>
               <h2>
@@ -128,16 +138,6 @@ const VotePanelContent = React.memo(
               </p>
             </React.Fragment>
           )}
-          {description && (
-            <React.Fragment>
-              <h2>
-                <Label>Description</Label>
-              </h2>
-              <p>
-                <VoteText text={description} />
-              </p>
-            </React.Fragment>
-          )}
         </Part>
         <SidePanelSeparator />
         <Part>

diff --git a/apps/voting/app/src/components/VotingCard/VotingCard.js b/apps/voting/app/src/components/VotingCard/VotingCard.js
@@ -76,7 +76,7 @@ const VotingCard = React.memo(
             <Label>
               <Text color={theme.textTertiary}>#{voteId} </Text>
               <span>
-                <VoteText text={metadata || description} />
+                <VoteText text={description || metadata} />
               </span>
             </Label>
             <VotingOptions options={options} votingPower={votingPower} />

diff --git a/apps/voting/app/src/script.js b/apps/voting/app/src/script.js
@@ -239,8 +239,6 @@ async function loadVoteDescription(vote) {
   } catch (error) {
     console.error('Error describing vote script', error)
     vote.description = 'Invalid script. The result cannot be executed.'
-    // Clear metadata so ensure it's rendered with a description rather than question
-    vote.metadata = null
   }
 
   return vote