Merge pull request #1728 from daostack/release

Release 0.10.8

.travis.yml

@@ -37,14 +37,12 @@ script:
   # unit tests
   - npm run test:unit -- --forceExit
 
-  - docker-compose logs alchemy
   # run integration tests
   - npm run test:integration:headless
 
   # get some diagnostic info fo debugging travis
   - echo 'Debug info:' && echo -en 'travis_fold:start:script.3\\r'
   - npm run service-status
-  - docker-compose logs alchemy
   - echo -en 'travis_fold:end:script.3\\r'
 
   - ./scripts/checkDaos.sh

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.10.8
+  - Features Added
+    -- nicer formatting of embedded videos in proposal descriptions
+    -- added help text for proposal descriptions
+    -- in the Plugin Manager, Edit Plugin Proposal details, make the copy-to-clipboard button issue a notification when complete
+
+  - Bugs Fixed
+    -- reenabled the "+ New Proposal" button at the bottom of plugin pages when there are currently no proposals
+    -- fixed Disqus conversations that were leaking between proposals and DAOs
+    -- fixed required permissions when editing a Plugin Manager scheme
+    -- correct the ABI on the ensPublicResolver GenericScheme which caused execution of proposals to fail while seeming to succeed
+    -- prevent embedded videos that are playing from stopping when an app notification appears
+    -- remove the "+ New Proposal" button on non-supported schemes
+    -- fix the Edit Scheme button to bring up the Edit Scheme popup isnteadl of the New Proposal popup
+
 ## 0.10.7
   - Features Added
     - Added "Stake for Reputation Plugin" to the list of known plugins that can be registered to a DAO
@@ -18,7 +33,6 @@
   - Bugs Fixed
     - Make sure proposer name doesn't overlap avatar on proposal history rows
 
-
 ## 0.10.5
   - Features Added
     - change home page to show DAOs again instead of feed. Show separate "Your DAOs" section containing DAOs the user follows or is a member of, then the list of other DAOs below.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy-client",
-  "version": "0.10.7",
+  "version": "0.10.8",
   "description": "An app for collaborative networks (DAOs), based on the DAO stack.",
   "author": "DAOstack",
   "license": "GPL-3.0",
@@ -79,8 +79,8 @@
   "dependencies": {
     "3box": "1.17.1",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
-    "@daostack/arc.js": "0.2.68",
-    "@dorgtech/daocreator-ui": "^1.0.8",
+    "@daostack/arc.js": "^0.2.69",
+    "@dorgtech/daocreator-ui": "^1.0.9",
     "@fortawesome/fontawesome-svg-core": "^1.2.10",
     "@fortawesome/free-brands-svg-icons": "^5.6.1",
     "@fortawesome/react-fontawesome": "^0.1.3",

src/assets/styles/global.scss

@@ -29,6 +29,13 @@
   z-index: 99999;
 }
 
+/**
+ * torus popup
+ */
+:global iframe#torusIframe {
+  z-index: 1000000;
+}
+
 /**
  * the Wallet Connect QR code popup
  */

src/components/Dao/DaoLandingPage.tsx

@@ -20,7 +20,11 @@ type IProps = IExternalProps;
 
 export default class DaoLandingPage extends React.Component<IProps, IStateProps> {
 
-  private disqusConfig: any;
+  private disqusConfig = {
+    url: "",
+    identifier: "",
+    title: "",
+  };
 
   constructor(props: IProps) {
     super(props);
@@ -30,11 +34,6 @@ export default class DaoLandingPage extends React.Component<IProps, IStateProps>
   }
 
   public componentDidMount() {
-    this.disqusConfig = {
-      url: process.env.BASE_URL + "/dao/" + this.props.daoState.address + "/discussion",
-      identifier: this.props.daoState.address,
-      title: "Discuss " + this.props.daoState.name,
-    };
 
     Analytics.track("Page View", {
       "Page Name": Page.DAOLanding,
@@ -54,6 +53,10 @@ export default class DaoLandingPage extends React.Component<IProps, IStateProps>
   public render() {
     const daoState = this.props.daoState;
 
+    this.disqusConfig.url = `${process.env.BASE_URL}/dao/${this.props.daoState.address}/discussion`;
+    this.disqusConfig.identifier = this.props.daoState.address;
+    this.disqusConfig.title = "Discuss " + this.props.daoState.name;
+
     return (
       <div className={css.landingPage}>
 

src/components/Proposal/Create/CreateProposal.scss

@@ -91,6 +91,15 @@
       height: calc(100% - 40px);
     }
 
+    .proposalDescriptionLabelText {
+      display: flex;
+      padding-bottom: 4px;
+
+      .body {
+        margin-right: 6px;
+      }
+    }
+
     .dates {
       display: grid;
       grid-column-gap: 12px;
@@ -196,13 +205,6 @@
         font-weight: bold;
         margin-right: 4px;
       }
-
-      .infoTooltip {
-        position: absolute;
-        right: 0;
-        display: none;
-        right: -17px;
-      }
     }
 
     .errorMessage {

src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx

@@ -14,6 +14,7 @@ import { showNotification, NotificationStatus } from "reducers/notifications";
 import { exportUrl, importUrlValues } from "lib/proposalUtils";
 import * as css from "../CreateProposal.scss";
 import MarkdownField from "./MarkdownField";
+import HelpButton from "components/Shared/HelpButton";
 
 const Select = React.lazy(() => import("react-select"));
 
@@ -250,9 +251,10 @@ class CreateContributionReward extends React.Component<IProps, IStateProps> {
 
               <TrainingTooltip overlay={this.fnDescription} placement="right">
                 <label htmlFor="descriptionInput">
-                  <div className={css.requiredMarker}>*</div>
-                Description
-                  <img className={css.infoTooltip} src="/assets/images/Icon/Info.svg"/>
+                  <div className={css.proposalDescriptionLabelText}>
+                    <div className={css.requiredMarker}>*</div>
+                    <div className={css.body}>Description</div><HelpButton text={HelpButton.helpTextProposalDescription} />
+                  </div>
                   <ErrorMessage name="description">{(msg: string) => <span className={css.errorMessage}>{msg}</span>}</ErrorMessage>
                 </label>
               </TrainingTooltip>

src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx

@@ -22,6 +22,7 @@ import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector";
 import TrainingTooltip from "components/Shared/TrainingTooltip";
 import * as css from "../CreateProposal.scss";
 import MarkdownField from "./MarkdownField";
+import HelpButton from "components/Shared/HelpButton";
 
 const BN = require("bn.js");
 
@@ -409,9 +410,10 @@ class CreateKnownSchemeProposal extends React.Component<IProps, IState> {
                   />
 
                   <label htmlFor="descriptionInput">
-                    <div className={css.requiredMarker}>*</div>
-                      Description
-                    <img className={css.infoTooltip} src="/assets/images/Icon/Info.svg"/>
+                    <div className={css.proposalDescriptionLabelText}>
+                      <div className={css.requiredMarker}>*</div>
+                      <div className={css.body}>Description</div><HelpButton text={HelpButton.helpTextProposalDescription} />
+                    </div>
                     <ErrorMessage name="description">{(msg) => <span className={css.errorMessage}>{msg}</span>}</ErrorMessage>
                   </label>
                   <Field

src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx

@@ -10,7 +10,7 @@ import { createProposal } from "actions/arcActions";
 import { showNotification, NotificationStatus } from "reducers/notifications";
 import Analytics from "lib/analytics";
 import { isValidUrl } from "lib/util";
-import { GetSchemeIsActiveActions, getSchemeIsActive, REQUIRED_SCHEME_PERMISSIONS, schemeNameAndAddress, SchemePermissions } from "lib/schemeUtils";
+import { GetSchemeIsActiveActions, getSchemeIsActive, REQUIRED_SCHEME_PERMISSIONS, schemeNameAndAddress, SchemePermissions, schemeNameFromAddress } from "lib/schemeUtils";
 import { exportUrl, importUrlValues } from "lib/proposalUtils";
 import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik";
 import classNames from "classnames";
@@ -19,6 +19,7 @@ import { connect } from "react-redux";
 import * as React from "react";
 import * as css from "../CreateProposal.scss";
 import MarkdownField from "./MarkdownField";
+import HelpButton from "components/Shared/HelpButton";
 
 
 interface IExternalProps {
@@ -137,12 +138,22 @@ class CreateSchemeRegistrarProposal extends React.Component<IProps, IState> {
     } else {
       proposalType = IProposalType.SchemeRegistrarEdit;
     }
+
+    let permissionString;
+    if (schemeNameFromAddress(values.schemeToEdit) === "Plugin Manager") {
+      //The code "disable" by default all schemes permissions.
+      //This "hack" is to make sure editing "Plugin Manager" scheme give it propoper permissions.
+      permissionString = "0x0000001f";
+    } else {
+      permissionString = "0x" + permissions.toString(16).padStart(8, "0");
+    }
+
     const proposalValues = {
       ...values,
       dao: this.props.daoAvatarAddress,
       type: proposalType,
       parametersHash: values.parametersHash,
-      permissions: "0x" + permissions.toString(16).padStart(8, "0"),
+      permissions: permissionString,
       scheme: this.props.scheme.address,
       schemeToRegister: currentTab === "addScheme" ? values.schemeToAdd :
         currentTab === "editScheme" ? values.schemeToEdit :
@@ -151,7 +162,6 @@ class CreateSchemeRegistrarProposal extends React.Component<IProps, IState> {
     };
     setSubmitting(false);
     await this.props.createProposal(proposalValues);
-
     Analytics.track("Submit Proposal", {
       "DAO Address": this.props.daoAvatarAddress,
       "Proposal Title": values.title,
@@ -364,9 +374,10 @@ class CreateSchemeRegistrarProposal extends React.Component<IProps, IState> {
 
                     <TrainingTooltip overlay={fnDescription} placement="right">
                       <label htmlFor="descriptionInput">
-                        <div className={css.requiredMarker}>*</div>
-                      Description
-                        <img className={css.infoTooltip} src="/assets/images/Icon/Info.svg" />
+                        <div className={css.proposalDescriptionLabelText}>
+                          <div className={css.requiredMarker}>*</div>
+                          <div className={css.body}>Description</div><HelpButton text={HelpButton.helpTextProposalDescription} />
+                        </div>
                         <ErrorMessage name="description">{(msg) => <span className={css.errorMessage}>{msg}</span>}</ErrorMessage>
                       </label>
                     </TrainingTooltip>

src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx

@@ -12,6 +12,7 @@ import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector";
 import TrainingTooltip from "components/Shared/TrainingTooltip";
 import * as css from "../CreateProposal.scss";
 import MarkdownField from "./MarkdownField";
+import HelpButton from "components/Shared/HelpButton";
 
 interface IExternalProps {
   daoAvatarAddress: string;
@@ -185,8 +186,7 @@ class CreateGenericScheme extends React.Component<IProps, IStateProps> {
               <TrainingTooltip overlay={fnDescription} placement="right">
                 <label htmlFor="descriptionInput">
                   <div className={css.requiredMarker}>*</div>
-                Description
-                  <img className={css.infoTooltip} src="/assets/images/Icon/Info.svg"/>
+                  <div className={css.body}>Description</div><HelpButton text={HelpButton.helpTextProposalDescription} />
                   <ErrorMessage name="description">{(msg: string) => <span className={css.errorMessage}>{msg}</span>}</ErrorMessage>
                 </label>
               </TrainingTooltip>

src/components/Proposal/ProposalDetails.scss

@@ -312,7 +312,6 @@ button.disabled {
 
 iframe.embeddedVideo {
   margin-top: 10px;
-  width: 100%;
 }
 
 @media only screen and (max-width: 425px) {