Merge pull request #2143 from daostack/release

Release v0.10.16

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.10.16
+  - Features Added
+   - show account holdings even when out of scope of a DAO
+   - remove email notifications signup button on xDAI
+   - whitelist the PAN token
+   - add ability to filter proposal history by proposal title text
+
+  - Bugs Fixed
+    - properly report on why you can't vote or stake once the proposal is executed
+    - fix ability to redeem contribution rewards on Kovan
+
 ## 0.10.15
   - Features Added
    - update subgraph endpoints

data/tokens.json

@@ -77,6 +77,11 @@
         "decimals": 18,
         "name": "DMM: Governance",
         "symbol": "DMG"
+      },
+      "0xd56dac73a4d6766464b38ec6d91eb45ce7457c44": {
+        "decimals": 18,
+        "name": "Panvala pan",
+        "symbol": "PAN"
       }
     }
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy-client",
-  "version": "0.10.15",
+  "version": "0.10.16",
   "description": "An app for collaborative networks (DAOs), based on the DAO stack.",
   "author": "DAOstack",
   "license": "GPL-3.0",
@@ -68,8 +68,8 @@
     "start-prod": "cross-env NODE_ENV=production SHOW_ALL_DAOS=false NETWORK=main node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js  --config webpack.dev.config.js",
     "start-staging-kovan": "cross-env NODE_ENV=production SHOW_ALL_DAOS=true NETWORK=kovan node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
     "start-staging-rinkeby": "cross-env NODE_ENV=production SHOW_ALL_DAOS=true NETWORK=rinkeby node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
+    "start-staging-xdai": "cross-env NODE_ENV=production SHOW_ALL_DAOS=true NETWORK=xdai node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
     "start-staging": "npm run start-staging-rinkeby",
-    "start-xdai": "cross-env NODE_ENV=production SHOW_ALL_DAOS=true NETWORK=xdai node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
     "storybook": "start-storybook",
     "test": "wdio ./test/integration/wdio.conf.js",
     "test:integration": "wdio ./test/integration/wdio.conf.js --inspect",
@@ -79,7 +79,7 @@
   "dependencies": {
     "3box": "1.17.1",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
-    "@daostack/arc.js": "^0.2.72",
+    "@daostack/arc.js": "0.2.73",
     "@dorgtech/daocreator-ui": "^1.0.13",
     "@fortawesome/fontawesome-svg-core": "^1.2.10",
     "@fortawesome/free-brands-svg-icons": "^5.6.1",

src/components/Account/AccountBalances.tsx

@@ -15,41 +15,41 @@ interface IExternalProps {
   address: Address;
 }
 
-type IProps = IExternalProps & ISubscriptionProps<[IMemberState, BN|null, BN|null]>
+type IProps = IExternalProps & ISubscriptionProps<[Address, IMemberState, BN|null, BN|null]>
 
 class AccountBalances extends React.Component<IProps, null> {
 
   public render(): RenderOutput {
     const { dao, data } = this.props;
 
-    if (!data) {
-      return null;
-    }
-
-    const [currentAccountState, ethBalance, genBalance] = data;
+    const [currentAccountAddress, currentAccountState, ethBalance, genBalance] = data;
 
     return (
       <div className={css.balances}>
-        <h2>Reputation</h2>
-        { dao ?
-          <div className={css.daoBalance}>
-            <b>{dao.name}</b>
-            <Reputation daoName={dao.name} totalReputation={dao.reputationTotalSupply} reputation={currentAccountState.reputation} hideTooltip/>
-          </div>
-          :
-          <div className={css.noReputation}>
-              No Reputation
-          </div>
+        { (dao && currentAccountState) ?
+          <div className={css.repBalance}>
+            <div className={css.heading}>Reputation</div>
+            <div className={css.rep}>
+              <div>{dao.name}</div>
+              <div className={css.underline}></div>
+              <div><Reputation daoName={dao.name} totalReputation={dao.reputationTotalSupply} reputation={currentAccountState.reputation} hideTooltip /></div>
+            </div>
+          </div> : dao ?
+            <div className={css.noReputation}>
+            No Reputation
+            </div> : ""
         }
-        <div className={css.userBalance}>
-          <h2>Holdings</h2>
-          <div>
-            <AccountBalance tokenSymbol={baseTokenName()} balance={ethBalance} accountAddress={currentAccountState.address} />
-          </div>
-          <div>
-            <AccountBalance tokenSymbol={genName()} balance={genBalance} accountAddress={currentAccountState.address} />
+        { currentAccountAddress ?
+          <div className={css.userBalance}>
+            <div className={css.heading}>Holdings</div>
+            <div>
+              <AccountBalance tokenSymbol={baseTokenName()} balance={ethBalance} accountAddress={currentAccountAddress} />
+            </div>
+            <div>
+              <AccountBalance tokenSymbol={genName()} balance={genBalance} accountAddress={currentAccountAddress} />
+            </div>
           </div>
-        </div>
+          : "" }
       </div>
     );
   }
@@ -65,14 +65,11 @@ export default withSubscription({
   },
 
   createObservable: ({ dao, address }: IExternalProps) => {
-    if (!dao) {
-      return of(null);
-    }
-    const daoState = dao;
     const arc = getArc();
 
     return combineLatest(
-      address && daoState.dao.member(address).state( { subscribe: true }) || of(null),
+      address,
+      (address && dao && dao.dao.member(address).state( { subscribe: true })) || of(null),
       ethBalance(address).pipe(ethErrorHandler()),
       arc.GENToken().balanceOf(address).pipe(ethErrorHandler()),
     );

src/components/Account/AccountProfilePage.tsx

@@ -284,7 +284,7 @@ class AccountProfilePage extends React.Component<IProps, IState> {
                     }
                     <div className={css.otherInfoContainer}>
                       <div className={css.tokens}>
-                        {accountInfo
+                        {(accountInfo && dao)
                           ? <div><strong>Rep. Score</strong><br /><Reputation reputation={accountInfo.reputation} totalReputation={dao.reputationTotalSupply} daoName={dao.name} /> </div>
                           : ""}
                         <div><strong>{genName()}:</strong><br /><span>{formatTokens(genBalance)}</span></div>

src/components/Buidlhub/Registration.scss

@@ -1,101 +1,97 @@
 .bhubRegContainer {
+  width: 100% !important;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-content: flex-start;
+  align-items: flex-start;
+  padding: 10px;
+
+  .bhubIcon {
     width: 100% !important;
     display: flex;
+    text-align: left;
     flex-direction: column;
     justify-content: flex-start;
-    align-content: flex-start;
     align-items: flex-start;
-    padding: 10px;
+    padding: 0 !important;
+    margin-left: -40px !important;
+  }
 
+  .inputWrapper {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: flex-start;
 
-    .bhubIcon {
-        width: 100% !important;
-        display: flex;
-        text-align: left;
-        flex-direction: column;
-        justify-content: flex-start;
-        align-items: flex-start;
-        padding: 0 !important;
-        margin-left: -40px !important;
+    .emailInput {
+      border-radius: 5px;
+      height: 30px !important;
+      padding: 5px;
+      border: 1px solid #aaa;
+      margin-right: 5px !important;
     }
 
-    .inputWrapper {
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        .emailInput {
-            border-radius: 5px;
-            height: 30px !important;
-            padding: 5px;
-            border: 1px solid #aaa;
-            margin-right: 5px !important;
-        }
-
-
-        .sendButtonWrapper {
-            height: 30px;
-            display: inline-flex;
-            justify-content: center; 
-            align-items: center;
+    .sendButtonWrapper {
+      height: 30px;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
 
-            .sendButton {
-                background-color: rgba(104, 155, 214, 1);
-                border: 1px solid #333;
-                border-radius: 5px;
-                color: white;
+      .sendButton {
+        background-color: rgba(104, 155, 214, 1);
+        border: 1px solid #333;
+        border-radius: 5px;
+        color: white;
 
-                &:hover {
-                    background-color: rgba(3, 118, 255, 1);
-                    cursor: pointer;
-                }
-            }
+        &:hover {
+          background-color: rgba(3, 118, 255, 1);
+          cursor: pointer;
+        }
+      }
 
-            .sendButtonDisabled {
-                background-color: #ccc;
-                border: 1px solid #aaa;
-                border-radius: 5px;
-                color: #aaa;
-                &:hover {
-                    cursor: default;
-                }    
-            }
+      .sendButtonDisabled {
+        background-color: #ccc;
+        border: 1px solid #aaa;
+        border-radius: 5px;
+        color: #aaa;
+        &:hover {
+          cursor: default;
         }
+      }
     }
+  }
 
-    .error {
-        width: 100% !important;
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        align-items: flex-start;
-        color: red;
-        font-size: 1rem;
-    }
+  .error {
+    width: 100% !important;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: flex-start;
+    color: red;
+    font-size: 1rem;
+  }
 
-
-    .success {
-        width: 100% !important;
-        display: flex;
-        flex-direction: row;
-        justify-content: flex-start;
-        align-items: flex-start;
-        color: green;
-        font-size: 1.3rem;
+  .success {
+    width: 100% !important;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: flex-start;
+    color: $accent-3;
+    font-size: 1.3rem;
 
-        .message {
-            color: #333;
-            font-size: .9rem;
-            font-weight: 100;
-            padding-left: 20px; 
-        }
+    .message {
+      color: #333;
+      font-size: 0.9rem;
+      font-weight: 100;
+      padding-left: 20px;
     }
+  }
 
-    .description {
-
-        font-size: 1rem !important;
-        font-weight: 100 !important;
-        padding-bottom: 10px;
-    }
-}
+  .description {
+    font-size: 1rem !important;
+    font-weight: 100 !important;
+    padding-bottom: 10px;
+  }
+}

src/components/Dao/Dao.scss

@@ -103,17 +103,6 @@ button:hover {
   }
 }
 
-.proposalHistoryTable {
-  width: 100%;
-  border-collapse: collapse;
-}
-
-.proposalHistoryTableHeader {
-  font-size: 12px;
-  font-weight: bold;
-  text-align: left;
-}
-
 .noticeWrapper {
   width: 100%;
   position: fixed;
@@ -263,17 +252,6 @@ a {
   }
 }
 
-.daoHistoryHeader {
-  font-size: 28px;
-  color: rgba(104, 155, 214, 1);
-  border-bottom: 1px solid rgba(45, 109, 181, 0.2);
-  padding-bottom: 5px;
-  font-weight: bold;
-  margin-bottom: 30px;
-  background-color: rgba(229, 235, 242, 1);
-  padding-top: 10px;
-}
-
 @media only screen and (max-width: 425px) {
   .outer {
     display: block;
@@ -353,14 +331,6 @@ a {
   .membersContainer h2 {
     padding-left: 10px;
   }
-
-  .daoHistoryHeader {
-    padding-left: 10px;
-  }
-
-  .proposalHistoryTableHeader {
-    display: none;
-  }
 }
 
 :global .infinite-scroll-component {