Merge pull request #1788 from daostack/release

Release 0.10.9

CHANGELOG.md

@@ -1,3 +1,26 @@
+## 0.10.9
+  - Features Added
+    - extend Scheme URL Params => Proposal Templates to Competition proposal & competition submission
+    - top three boosted proposals shown on plugin cards are now sorted by when they were boosted, descending
+    - custom DAO landing page data for the SOS Hackathon
+    - enable Competition proposals and Competition Submissions to have embedded videos in their description
+    - allow "Recipient address" in proposal form to be empty (and be populated with proposer address)
+    - enable Redemptions dropdown menu to automatically update with blockchain changes
+    - show Redemptions tooltip on Redeem button when the button is disabled
+    - add new ENSPublicResolver GenericScheme target contract
+    - page the fetching of preboosted proposals at 100 per page
+    - remove redundant New Proposal button on the Plugin Proposals page
+    - improve description of plugin permission Mint and Burn
+
+  - Bugs Fixed
+    - fix erroneous reputation and GEN redemption sums in Redemption dropdown menu cards
+    - enable voter 3Box profiles to always all show in proposal Voters popup
+    - fix GEN label position in staking popup
+    - fix proposal status countdown when the number of days exceeds 30
+    - improvments to the All DAOs layout, the DAO sidebar on mobile, the mobile dropdown with no DAO selected, Proposal Details page, DAO Landing page on mobile
+    - fixed bug on proposal History page when displaying voting results and YES got 100%
+    - reject displaying proposal in the context of a DAO that wasn't responsible for creating it
+
 ## 0.10.8
   - Features Added
     -- nicer formatting of embedded videos in proposal descriptions

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy-client",
-  "version": "0.10.8",
+  "version": "0.10.9",
   "description": "An app for collaborative networks (DAOs), based on the DAO stack.",
   "author": "DAOstack",
   "license": "GPL-3.0",

src/components/Account/AccountProfilePage.tsx

@@ -93,9 +93,11 @@ class AccountProfilePage extends React.Component<IProps, IState> {
   }
 
   public async componentDidMount(): Promise<void> {
-    const { accountAddress, getProfile } = this.props;
+    const { accountAddress, getProfile, accountProfile} = this.props;
 
-    getProfile(accountAddress);
+    if (!accountProfile) {
+      getProfile(accountAddress);
+    }
 
     const dao = this.props.data[0];
 

src/components/Dao/DaoLandingPage.scss

@@ -76,3 +76,9 @@
     margin-bottom: 1rem;
   }
 }
+
+@media only screen and (max-width: 425px) {
+  .landingPage {
+    padding: 0 12px;
+  }
+}

src/components/Dao/DaoLandingPage.tsx

@@ -72,12 +72,26 @@ export default class DaoLandingPage extends React.Component<IProps, IStateProps>
             </div>
           </div>
 
-          <div className={css.welcome}>Welcome to {daoState.name}, a decentralized organization built on DAOstack.</div>
+          { (daoState.address === "0xfaf05fedf06cac499b899d6a2052f23ae239b29d") ? // SoS Collective on xDAI
+            <>
+              <div className={css.welcome}>Welcome to the {daoState.name} digital co-op.</div>
+              <div className={css.welcome}>Our first event is the <a href="https://soshackathon.com/" target="_blank" rel="noopener noreferrer">SoS Hackathon</a>: Fund your ideas and solutions to heal the world in crisis.</div>
+              <ul>
+                <li>Register for the hackathon <a href="https://bit.ly/GlobalSOSRegistration" target="_blank" rel="noopener noreferrer">here</a>.</li>
+                <li>Create an onboarding proposal for the cooperative <Link to={`/dao/${daoState.id}/scheme/0xd4b6ee901566c88f942c2a04803f65cb7a554d8bc9a8f4fb5ded5cd012ca0897/proposals/create/?beneficiary=&description=This%20is%20an%20introduction%20proposal%20to%20join%20the%20builder%20collective%20and%20SoS%20hackathon.%20Please%20fill%20out%20%3CYOUR%20NAME%3E,%20%3CLINK%20TO%20YOUR%20DISCORD%20ID%3E,%20%3CYOURSKILLS%3E,%20and%20%3CWHAT%20ARE%20YOU%20EXCITED%20ABOUT%3E&ethReward=0&externalTokenAddress=0x543ff227f64aa17ea132bf9886cab5db55dcaddf&externalTokenReward=0&nativeTokenReward=0&reputationReward=50&title=Onboarding%20:%20%3CYOUR%20NAME%3E&url=&tags=[]`}>here</Link>.</li>
+                <li>Join our Discord community for further discussions here: <a href="https://discord.gg/rUr3rp7" target="_blank" rel="noopener noreferrer">https://discord.gg/rUr3rp7</a></li>
+              </ul>
+            </>
+            :
+            <>
+              <div className={css.welcome}>Welcome to {daoState.name}, a decentralized organization built on DAOstack.</div>
+
+              <div className={css.visitProposals}>Visit the <Link to={`/dao/${daoState.id}/schemes/`}>Proposals page</Link> to
+                make a proposal to the DAO or vote on existing proposals.</div>
+            </>
+          }
 
-          <div className={css.visitProposals}>Visit the <Link to={`/dao/${daoState.id}/schemes/`}>Proposals page</Link> to
-          make a proposal to the DAO or vote on existing proposals.</div>
         </div>
-
         <div className={css.wallContainer}>
           <div className={css.headerText}>Discuss {daoState.name}</div>
           <DiscussionEmbed shortname={process.env.DISQUS_SITE} config={this.disqusConfig} />

src/components/Dao/ProposalSchemeCard.tsx

@@ -96,7 +96,9 @@ export default withSubscription({
         scheme:  props.scheme.id,
         // eslint-disable-next-line @typescript-eslint/camelcase
         stage_in: [IProposalStage.Boosted, IProposalStage.QuietEndingPeriod],
-      }}, {
+      },
+      orderBy: "boostedAt",
+      }, {
         fetchAllData: true,
         subscribe: true, // subscribe to updates of the proposals. We can replace this once https://github.com/daostack/subgraph/issues/326 is done
       }) // the list of boosted proposals