Merge branch 'add3BoxCommentsUsingThreads' of https://github.com/daos…

…tack/alchemy into add3BoxCommentsUsingThreads
daostack · Aug 17, 2020 · 00b9c4a · 00b9c4a
2 parents 9f7d2a7 + 0522cbd
commit 00b9c4a
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 49 deletions.
diff --git a/src/assets/locales/en/translation.json b/src/assets/locales/en/translation.json
@@ -31,5 +31,6 @@
     "3BoxLoginSuccess": "Logged in to 3Box",
     "3BoxProfileSuccess": "Profile data saved to 3Box",
     "Following": "Now following",
-    "UnFollowing": "No longer following"
+    "UnFollowing": "No longer following",
+    "Raw call data": "Raw call data"
 }
diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryCO2ken.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryCO2ken.tsx
@@ -3,9 +3,11 @@ import { IGenericPluginProposalState } from "@daostack/arc.js";
 import BN = require("bn.js");
 import classNames from "classnames";
 import { GenericPluginInfo } from "genericPluginRegistry";
-import { formatTokens } from "lib/util";
+import { formatTokens, truncateWithEllipses } from "lib/util";
 import * as React from "react";
 import * as css from "./ProposalSummary.scss";
+import CopyToClipboard from "components/Shared/CopyToClipboard";
+import i18next from "i18next";
 
 interface IProps {
   genericPluginInfo: GenericPluginInfo;
@@ -16,6 +18,14 @@ interface IProps {
 
 export default class ProposalSummaryCO2ken extends React.Component<IProps, null> {
 
+  private rawCallData(proposalState: IGenericPluginProposalState) {
+    return <>
+      <p>{i18next.t("Raw call data")}:</p>
+      <pre>
+        {truncateWithEllipses(proposalState.callData, 66)}<CopyToClipboard value={proposalState.callData} />
+      </pre>
+    </>;
+  }
   public render(): RenderOutput {
     const { proposalState, detailView, genericPluginInfo, transactionModal } = this.props;
     let decodedCallData: any;
@@ -47,7 +57,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
             <span className={css.summaryTitle}>
               {action.label}
             </span>
-            { detailView ?
+            {detailView ?
               <div className={css.summaryDetails}>
                 <div>
                   <p>
@@ -64,6 +74,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                     <a href={`https://cloudflare-ipfs.com/ipfs/${ipfsHashValue}`} target="_blank" rel="noopener noreferrer">{ipfsHashValue}</a>
                   </pre>
                 </div>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -84,6 +95,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                 <pre>{-1}</pre>
                 It allows the the CO2ken contract to move DAI held by the DAO. This way, the DAO can offset its emissions by calling:
                 <pre>offsetCarbon()</pre>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -100,6 +112,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                 Executing this proposal will call the function
                 <pre>{action.id}()</pre>
                 It transfers all the DAI stored in the CO2ken contract to the DAO.
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -116,12 +129,13 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
             </span>
             {detailView ?
               <div className={css.summaryDetails}>
-                Executing this proposal will call the function
+                  Executing this proposal will call the function
                 <pre>{action.id}()</pre>
-                DAI are sent to the CO2ken contract to retire a respecive number of CO2kens. One CO2ken is equivalent to a ton of carbon emissions. The total amount of DAI which will be sent to the contract is:
+                  DAI are sent to the CO2ken contract to retire a respecive number of CO2kens. One CO2ken is equivalent to a ton of carbon emissions. The total amount of DAI which will be sent to the contract is:
                 <pre>
                   {formatTokens(new BN(value), field.unit, field.decimals)}
                 </pre>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -139,13 +153,14 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
             </span>
             {detailView ?
               <div className={css.summaryDetails}>
-                Executing this proposal will call the function
+                  Executing this proposal will call the function
                 <pre>{action.id}()</pre>
                 with value
                 <pre>
-                  { field.label }: {formatTokens(new BN(value), field.unit, field.decimals)}
+                  {field.label}: {formatTokens(new BN(value), field.unit, field.decimals)}
                 </pre>
                 The value describes the amount of carbon tons the DAO wants to offset.
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -161,10 +176,11 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
             </span>
             {detailView ?
               <div className={css.summaryDetails}>
-                Executing this proposal will call the function
+                  Executing this proposal will call the function
                 <pre>{action.id}()</pre>
                 with the new owner‘s address being
                 <pre>{decodedCallData.values[0]}</pre>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }

diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryDutchX.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryDutchX.tsx
@@ -3,9 +3,11 @@ import { IGenericPluginProposalState } from "@daostack/arc.js";
 import BN = require("bn.js");
 import classNames from "classnames";
 import { GenericPluginInfo } from "genericPluginRegistry";
-import { formatTokens, linkToEtherScan } from "lib/util";
+import { formatTokens, linkToEtherScan, truncateWithEllipses } from "lib/util";
 import * as React from "react";
 import * as css from "./ProposalSummary.scss";
+import CopyToClipboard from "components/Shared/CopyToClipboard";
+import i18next from "i18next";
 
 interface IProps {
   genericPluginInfo: GenericPluginInfo;
@@ -16,6 +18,15 @@ interface IProps {
 
 export default class ProposalSummaryDutchX extends React.Component<IProps, null> {
 
+  private rawCallData(proposalState: IGenericPluginProposalState) {
+    return <>
+      <p>{i18next.t("Raw call data")}:</p>
+      <pre>
+        {truncateWithEllipses(proposalState.callData, 66)}<CopyToClipboard value={proposalState.callData} />
+      </pre>
+    </>;
+  }
+
   public render(): RenderOutput {
     const { proposalState, detailView, genericPluginInfo, transactionModal } = this.props;
     let decodedCallData: any;
@@ -50,13 +61,14 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
         return (
           <div className={proposalSummaryClass}>
             <span className={css.summaryTitle}>
-              <img src="/assets/images/Icon/edit-sm.svg"/>&nbsp;
+              <img src="/assets/images/Icon/edit-sm.svg" />&nbsp;
               {action.label}
               {renderValueHtml()}
             </span>
-            { detailView ?
+            {detailView ?
               <div className={css.summaryDetails}>
-                <div>{ action.fields[0].label}: <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a></div>
+                <div>{action.fields[0].label}: <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a></div>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -66,13 +78,14 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
         return (
           <div className={proposalSummaryClass}>
             <span className={css.summaryTitle}>
-              <img src="/assets/images/Icon/edit-sm.svg"/>&nbsp;
+              <img src="/assets/images/Icon/edit-sm.svg" />&nbsp;
               {action.label}
               {renderValueHtml()}
             </span>
-            { detailView ?
+            {detailView ?
               <div className={css.summaryDetails}>
                 New oracle address: <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -82,13 +95,14 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
         return (
           <div className={proposalSummaryClass}>
             <span className={css.summaryTitle}>
-              <img src="/assets/images/Icon/edit-sm.svg"/>&nbsp;
+              <img src="/assets/images/Icon/edit-sm.svg" />&nbsp;
               {action.label}
               {renderValueHtml()}
             </span>
-            { detailView ?
+            {detailView ?
               <div className={css.summaryDetails}>
                 New owner address: <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -102,11 +116,12 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
               {decodedCallData.values[1] ? "Whitelist" : "Delist"} {decodedCallData.values[0].length} token{decodedCallData.values[0].length !== 1 ? "s" : ""}
               {renderValueHtml()}
             </span>
-            { detailView ?
+            {detailView ?
               <div className={css.summaryDetails}>
                 <ul>
                   {decodedCallData.values[0].map((token: string) => <li key={token}><a href={linkToEtherScan(token)} target="_blank" rel="noopener noreferrer">{token}</a></li>)}
                 </ul>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }
@@ -120,12 +135,13 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
         return (
           <div className={proposalSummaryClass}>
             <span className={css.summaryTitle}>
-              <img src="/assets/images/Icon/edit-sm.svg"/>&nbsp;
-              { field.label }: {formatTokens(new BN(value), field.unit, field.decimals)}
+              <img src="/assets/images/Icon/edit-sm.svg" />&nbsp;
+              {field.label}: {formatTokens(new BN(value), field.unit, field.decimals)}
               {renderValueHtml()}
             </span>
             {detailView ?
               <div className={css.summaryDetails}>
+                {this.rawCallData(proposalState)}
               </div>
               : ""
             }

diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericPlugin.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericPlugin.tsx
@@ -10,6 +10,7 @@ import ProposalSummaryDutchX from "./ProposalSummaryDutchX";
 import ProposalSummaryStandardBounties from "./ProposalSummaryStandardBounties";
 import ProposalSummaryCO2ken from "./ProposalSummaryCO2ken";
 import ProposalSummaryNFTManager from "./ProposalSummaryNFTManager";
+import i18next from "i18next";
 
 interface IExternalProps {
   beneficiaryProfile?: IProfileState;
@@ -33,7 +34,7 @@ export default class ProposalSummary extends React.Component<IProps> {
       return <div
         className={isArrayItem ? css.arrayItem : ""}
         key={value}
-      >{truncatedValue}<CopyToClipboard value={value}/>{isArrayItem ? "," : ""}
+      >{truncatedValue}<CopyToClipboard value={value} />{isArrayItem ? "," : ""}
       </div>;
 
     } else {
@@ -118,6 +119,11 @@ export default class ProposalSummary extends React.Component<IProps> {
           <pre><a href={linkToEtherScan(proposalState.contractToCall)}>{proposalState.contractToCall}</a></pre>
           sending to contract:
           <pre className={sendsETH ? css.warning : ""}>{formatTokens(proposalState.value)} ETH</pre>
+
+          {i18next.t("Raw call data")}:
+          <pre>
+            {truncateWithEllipses(proposalState.callData, 66)}<CopyToClipboard value={proposalState.callData} />
+          </pre>
         </div>
         : ""
       }

diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryNFTManager.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryNFTManager.tsx
@@ -1,9 +1,11 @@
 import { IGenericPluginProposalState, IDAOState } from "@daostack/arc.js";
 import * as classNames from "classnames";
 import { GenericPluginInfo } from "genericPluginRegistry";
-import { linkToEtherScan } from "lib/util";
+import { linkToEtherScan, truncateWithEllipses } from "lib/util";
 import * as React from "react";
 import * as css from "./ProposalSummary.scss";
+import CopyToClipboard from "components/Shared/CopyToClipboard";
+import i18next from "i18next";
 const Web3 = require("web3");
 
 interface IProps {
@@ -55,20 +57,24 @@ export default class ProposalSummaryNFTManager extends React.Component<IProps, n
                 {decodedCallData.values[0]}
               </span>
             }
-            { detailView &&
+            {detailView &&
               <div className={css.summaryDetails}>
                 <div>
                   <strong>Send NFT </strong>
                   <img className={css.iconPadding} src="/assets/images/Icon/Transfer.svg" />
                   <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a>
                 </div>
-                <br/>
+                <br />
                 <div>
                   <strong>NFT Contract:</strong> <a href={linkToEtherScan(decodedCallData.values[1])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[1]}</a>
                 </div>
                 <div>
                   <strong>TokenID:</strong> {decodedCallData.values[2]}
                 </div>
+                <div>
+                  <strong>{i18next.t("Raw call data")}:</strong>
+                  {truncateWithEllipses(proposalState.callData, 66)}<CopyToClipboard value={proposalState.callData} />
+                </div>
               </div>
             }
           </div>