Merge pull request #2204 from daostack/release

Release 1.0.0
daostack · Oct 26, 2020 · 03b5417 · 03b5417
2 parents 3f56370 + 87237b7
commit 03b5417
Show file tree

Hide file tree

Showing 17 changed files with 544 additions and 497 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.0.0
+  - Features Added
+    - Show active proposal status on the Proposal History page
+    - Show sidebar links to switch Alchemy versions and between mainnet and xDai
+    - Show Alchemy 2.0 announcement banner
+
+  - Bugs Fixed
+    - fix display of certain token balances on Proposal cards and details
+    - fix display of contribution rewards in the redemptions tooltip over the Redeem button
+
 ## 0.10.17
   - Bugs Fixed
     - Fixed issues with automated update of blockchain data by switching from a websocket to a polling interface with the subgraph

diff --git a/data/tokens.json b/data/tokens.json
@@ -33,7 +33,7 @@
         "name": "Paxos Standard",
         "symbol": "PAX"
       },
-      "0x0000000000085d4780B73119b644AE5ecd22b376": {
+      "0x0000000000085d4780b73119b644ae5ecd22b376": {
         "decimals": 18,
         "name": "TrueUSD",
         "symbol": "TUSD"
@@ -63,7 +63,7 @@
         "name": "Centrality Token",
         "symbol": "CENNZ"
       },
-      "0x859401b46E0f8b1CdF5432Af4b1426a8a5E5e0C8": {
+      "0x859401b46e0f8b1cdf5432af4b1426a8a5e5e0c8": {
         "decimals": 18,
         "name": "i4 token",
         "symbol": "GEMS"
@@ -114,7 +114,7 @@
         "name": "USD Coin",
         "symbol": "USDC"
       },
-      "0x3426d85D140c85C5ebB6E4D343C5be8e4E001869": {
+      "0x3426d85d140c85c5ebb6e4d343c5be8e4e001869": {
         "decimals": 18,
         "name": "API3 token",
         "symbol": "API3"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alchemy-client",
-  "version": "0.10.17",
+  "version": "1.0.0",
   "description": "An app for collaborative networks (DAOs), based on the DAO stack.",
   "author": "DAOstack",
   "license": "GPL-3.0",

diff --git a/src/assets/styles/global-variables.scss b/src/assets/styles/global-variables.scss
@@ -1,37 +1,37 @@
 /* global-variables.scss */
 
 $bg-color: gray;
-$black: rgba(0, 0, 0, 1.000);
-$black-septone: rgba(0, 0, 0, .6);
-$black-halftone: rgba(0, 0, 0, .5);
-$black-thirdtone: rgba(0, 0, 0, .3);
-$black-tenthtone: rgba(0, 0, 0, .1);
-$gray-border: 1px solid rgba(151, 151, 151, 1.000);
-$gray-border-halftone: 1px solid rgba(151, 151, 151, .5);
-$proposal-item-border-bottom: 2px solid rgba(234, 234, 234, 1.000);
-$form-field-outline: 1px solid rgba(195, 191, 204, 1.000);
+$black: rgba(0, 0, 0, 1);
+$black-septone: rgba(0, 0, 0, 0.6);
+$black-halftone: rgba(0, 0, 0, 0.5);
+$black-thirdtone: rgba(0, 0, 0, 0.3);
+$black-tenthtone: rgba(0, 0, 0, 0.1);
+$gray-border: 1px solid rgba(151, 151, 151, 1);
+$gray-border-halftone: 1px solid rgba(151, 151, 151, 0.5);
+$proposal-item-border-bottom: 2px solid rgba(234, 234, 234, 1);
+$form-field-outline: 1px solid rgba(195, 191, 204, 1);
 $white: rgba(255, 255, 255, 1);
-$white-halftone: rgba(255, 255, 255, .5);
+$white-halftone: rgba(255, 255, 255, 0.5);
 $white-transparent: rgba(255, 255, 255, 0);
-$accent-1: rgba(58, 180, 208, 1.000);
-$accent-1-halftone: rgba(58, 180, 208, .5);
+$accent-1: rgba(58, 180, 208, 1);
+$accent-1-halftone: rgba(58, 180, 208, 0.5);
 $accent-1-transparent: rgba(58, 180, 208, 0);
-$accent-2: rgba(242, 175, 90, 1.000);
-$accent-2-halftone: rgba(242, 175, 90, .5);
-$accent-3: rgba(255, 0, 72, 1.000);
-$accent-3-halftone: rgba(255, 0, 72, .5);
-$accent-4: rgba(46, 168, 122, 1.000);
-$accent-4-halftone: rgba(46, 168, 122, .5);
+$accent-2: rgba(242, 175, 90, 1);
+$accent-2-halftone: rgba(242, 175, 90, 0.5);
+$accent-3: rgba(255, 0, 72, 1);
+$accent-3-halftone: rgba(255, 0, 72, 0.5);
+$accent-4: rgba(46, 168, 122, 1);
+$accent-4-halftone: rgba(46, 168, 122, 0.5);
 $accent-4-transparent: rgba(46, 168, 122, 0);
 
 $body-font: "Open Sans";
 $heading-1-font: "AccordBold";
 
-$shadow-1: 0 2px 4px 0 rgba(12,0,51,0.10);
-$shadow-2: 0 8px 16px 0 rgba(12,0,51,0.10);
-$shadow-3: 0 24px 32px 0 rgba(12,0,51,0.10);
+$shadow-1: 0 2px 4px 0 rgba(12, 0, 51, 0.1);
+$shadow-2: 0 8px 16px 0 rgba(12, 0, 51, 0.1);
+$shadow-3: 0 24px 32px 0 rgba(12, 0, 51, 0.1);
 
-$border-bottom-divider: 1px solid rgba(246, 246, 246, 1.000);
+$border-bottom-divider: 1px solid rgba(246, 246, 246, 1);
 
 $bold: 700;
 $normal: 400;
@@ -52,18 +52,19 @@ $max-width: 1080px;
 
 /* Alchemy Earth styles */
 
-$navy: rgba(18, 46, 91, 1.000);
-$sky: rgba(49, 120, 202, 1.000);
-$accent-1: rgba(3, 118, 255, 1.000); /* Bright blue */
-$accent-2: rgba(246, 80, 80, 1.000); /* Red */
-$accent-3: rgba(0, 190, 144, 1.000); /* Green */
-$accent-4: rgba(242, 192, 0, 1.000); /* Yellow */
-$accent-5: rgba(231, 240, 255, 1.000); /* Powder Blue */
-$accent-6: rgba(229, 235, 242, 1.000); /* Light blue background */
-$black: rgba(0, 29, 53, 1.000);
-$subhead: rgba(155, 170, 182, 1.000);
-$border-accent: rgba(170, 195, 227, 1.000); /* For hovers */
-$body-color: rgba(78, 97, 118, 1.000);
-$gray-1: rgba(154, 169, 181, 1.000);
-$gray-2: rgba(191, 203, 213, 1.000);
+$navy: rgba(18, 46, 91, 1);
+$sky: rgba(49, 120, 202, 1);
+$accent-1: rgba(3, 118, 255, 1); /* Bright blue */
+$accent-2: rgba(246, 80, 80, 1); /* Red */
+$accent-3: rgba(0, 190, 144, 1); /* Green */
+$accent-4: rgba(242, 192, 0, 1); /* Yellow */
+$accent-5: rgba(231, 240, 255, 1); /* Powder Blue */
+$accent-6: rgba(229, 235, 242, 1); /* Light blue background */
+$black: rgba(0, 29, 53, 1);
+$subhead: rgba(155, 170, 182, 1);
+$border-accent: rgba(170, 195, 227, 1); /* For hovers */
+$body-color: rgba(78, 97, 118, 1);
+$gray-1: rgba(154, 169, 181, 1);
+$gray-2: rgba(191, 203, 213, 1);
 $gray-border-2: 1px solid $gray-2;
+$banner-background: #d5d8ba;
diff --git a/src/components/Dao/Dao.scss b/src/components/Dao/Dao.scss
@@ -124,36 +124,22 @@ button:hover {
   flex-grow: 2;
   background-color: white;
   padding: 11px 8px;
-  color: rgba(78, 97, 118, 1);
-  font-size: 11px;
-  text-align: left;
+  color: $black;
+  font-size: 12px;
+  font-weight: 500;
+  text-align: center;
   font-family: "Open Sans";
   width: 100%;
 
-  div {
-    padding-left: 15px;
-
-    img {
-      margin-right: 8px;
-    }
-
-    b {
-      color: $accent-3;
-    }
+  a {
+    text-decoration: underline;
   }
 
   .notice::after {
     content: "";
     clear: both;
     display: table;
   }
-  .closeNotice {
-    position: absolute;
-    border: none;
-    outline: none;
-    right: 6px;
-    top: 13px;
-  }
 }
 
 .membersContainer {
@@ -291,24 +277,8 @@ a {
     }
 
     .notice {
-      font-size: 10px;
-      padding-right: 70px;
+      font-size: 11px;
       box-shadow: 0 2px 16px 0 rgba(133, 168, 208, 0.4);
-
-      div {
-        padding-left: 0;
-
-        img {
-          height: 18px;
-          float: left;
-          position: relative;
-          top: 5px;
-        }
-      }
-
-      .closeNotice {
-        background-color: transparent;
-      }
     }
   }
 

diff --git a/src/components/Dao/DaoContainer.tsx b/src/components/Dao/DaoContainer.tsx
@@ -23,7 +23,7 @@ import DaoHistoryPage from "./DaoHistoryPage";
 import DaoMembersPage from "./DaoMembersPage";
 import * as css from "./Dao.scss";
 import DaoLandingPage from "components/Dao/DaoLandingPage";
-import { standardPolling } from "lib/util";
+import { standardPolling, targetedNetwork } from "lib/util";
 
 type IExternalProps = RouteComponentProps<any>;
 
@@ -73,7 +73,7 @@ class DaoContainer extends React.Component<IProps, null> {
     />;
   private daoCrxProposalRoute = (routeProps: any) =>
     <DetailsPageRouter {...routeProps}
-      currentAccountAddress = {this.props.currentAccountAddress}
+      currentAccountAddress={this.props.currentAccountAddress}
       daoState={this.props.data[0]}
       proposalId={routeProps.match.params.proposalId}
     />;
@@ -85,6 +85,7 @@ class DaoContainer extends React.Component<IProps, null> {
 
   public render(): RenderOutput {
     const daoState = this.props.data[0];
+    const network = targetedNetwork();
 
     return (
       <div className={css.outer}>
@@ -99,11 +100,9 @@ class DaoContainer extends React.Component<IProps, null> {
         <div className={css.wrapper}>
           <div className={css.noticeWrapper}>
             <div className={css.noticeBuffer}></div>
-            <div className={css.notice}>
-              <div>
-                <img src="/assets/images/Icon/notice.svg" />
-                Alchemy and Arc are in Alpha. There will be BUGS! We don&apos;t guarantee complete security. *Play at your own risk*
-              </div>
+            <div className={css.notice}>Alchemy 2.0 has been released! Take a look <a
+              href={(network === "main") ? process.env.ALCHEMY_V2_URL_MAINNET : process.env.ALCHEMY_V2_URL_XDAI}
+              target="_blank" rel="noopener noreferrer">here</a>.
             </div>
           </div>
           <Switch>
@@ -144,7 +143,7 @@ class DaoContainer extends React.Component<IProps, null> {
 
 const SubscribedDaoContainer = withSubscription({
   wrappedComponent: DaoContainer,
-  loadingComponent: <Loading/>,
+  loadingComponent: <Loading />,
   errorComponent: (props) => <div>{props.error.message}</div>,
   checkForUpdate: ["daoAvatarAddress"],
   createObservable: (props: IExternalProps) => {

diff --git a/src/components/Dao/DaoHistoryPage.scss b/src/components/Dao/DaoHistoryPage.scss
@@ -19,6 +19,9 @@
     font-size: 12px;
     font-weight: bold;
     text-align: left;
+    .status {
+      text-align: center;
+    }
   }
 
   .searchBox {

diff --git a/src/components/Dao/DaoHistoryPage.tsx b/src/components/Dao/DaoHistoryPage.tsx
@@ -30,8 +30,7 @@ interface IState {
 type SubscriptionData = Array<Proposal>;
 type IProps = IExternalProps & IState & ISubscriptionProps<SubscriptionData>;
 
-const ProposalsHTML = (props:
-{
+const ProposalsHTML = (props: {
   proposals: Array<Proposal>;
   history: any;
   daoState: IDAOState;
@@ -141,7 +140,7 @@ class DaoHistoryPage extends React.Component<IProps, IState> {
                   <th>Title</th>
                   <th>Votes</th>
                   <th>Predictions</th>
-                  <th>Status</th>
+                  <th className={css.status}>Status</th>
                   <th>My actions</th>
                 </tr>
               </thead>

diff --git a/src/components/Daos/Daos.scss b/src/components/Daos/Daos.scss
@@ -6,7 +6,7 @@
 
   .paddingTop {
     position: sticky;
-    top: 50px;
+    top: 82px;
     height: 35px;
     z-index: 2;
     background-color: #e5ebf2;
@@ -15,7 +15,7 @@
   .topRow {
     display: flex;
     position: sticky;
-    top: 85px;
+    top: 117px;
     z-index: 2;
     background-color: rgba(229, 235, 242, 1);
 
@@ -56,7 +56,7 @@
   .otherDaos {
     .headerWrapper {
       position: sticky;
-      top: 138px;
+      top: 170px;
       z-index: 1;
     }
 
@@ -78,14 +78,12 @@
         color: rgb(104, 155, 214);
         padding-left: 25px;
         font-size: 25px;
-
 
         &:hover {
           cursor: pointer;
           color: rgba(3, 118, 255, 1);
         }
       }
-
     }
     .daoList {
       padding-top: 30px;