merge to master-2 (#2110)

* Updated arc.js, test env and subgraph (#2072) * Updated arc.js, test env and subgraph * join and quit --> join to match new arc.js * updated doc to Join instead of JoinAndQuit * refactor and fix issues relating 3box operations (#2018) * upgrade provider packages * update package-lock * remove webpack from dependencies * package-lock * lint * refactor, fix bugs * better console info on errors * clean up account profile loguc * remove unused webReducer stuff * merge conflict errors * added some i18next * upgrade provider packages * remove webpack from dependencies * package-lock * refactor, fix bugs * better console info on errors * clean up account profile loguc * merge conflict errors * added some i18next * package-lock * 3box fix for identity-wallet * fix bug in SAVE_THREEBOX * revert to 3box 1.20.3 * fix error in follow * remove Try Edit button * clean up canEdit logic * remove console.log statements * fix merge conflict * fix compile error * Update translation.json * update package-lock * Support DAOs sort by total holdings (#2085) * fething daos balances * Support for DAOs total holdings ; sorting by total holdings * Update translation.json Missing comma after resolving conflicts. * Minor adjustments due to changes in DAOs balances serivce that now returns balances only for registered DAOs (#2089) * Updated chrome driver for tests (#2093) * updated chrome driver for tests * updated version also for seleniumArgs * automatic update to the latest chrome driver * updated webdriverio * updated selenium * Update .travis.yml Removing auto version fetch as I'm not sure if it's working properly right now. Will check it next time. * updated dependencies (#2096) * automatically refresh voting status (#2102) * added default value and placeholder (#2091) * added default value and placeholder * removed default value * added dafualt value back * data field is now optional with default value * change text in placeholder * Support for Join and FundingRequest proposals (read only) (#2099) * Update subgraph endpoints to v8_12 (#2108) * update subgraph enpoints to v8_12 * also for mainnet * updated arc.js 54 (#2109) * release dev-2 to master-2 (#2079) * Updated arc.js, test env and subgraph (#2072) * Updated arc.js, test env and subgraph * join and quit --> join to match new arc.js * updated doc to Join instead of JoinAndQuit * Plugin manager create proposal modal has a left border and padding like the other modals (#2071) * fix UI where votes screwed up (#2070) * Better UI for DAO history page (#2069) * Update documentation (#2062) * updated documentation regarding i18next * updated with global variables for styling * example added * better example * refactor and fix issues relating 3box operations (#2018) * upgrade provider packages * update package-lock * remove webpack from dependencies * package-lock * lint * refactor, fix bugs * better console info on errors * clean up account profile loguc * remove unused webReducer stuff * merge conflict errors * added some i18next * upgrade provider packages * remove webpack from dependencies * package-lock * refactor, fix bugs * better console info on errors * clean up account profile loguc * merge conflict errors * added some i18next * package-lock * 3box fix for identity-wallet * fix bug in SAVE_THREEBOX * revert to 3box 1.20.3 * fix error in follow * remove Try Edit button * clean up canEdit logic * remove console.log statements * fix merge conflict * fix compile error * Update translation.json * update package-lock * fix issue when a proposal card is not always clickable (#2077) * revert subgraph endpoint domain (#2078) Co-authored-by: roienatan <[email protected]> Co-authored-by: Doug Kent <[email protected]> * Updated daocreator version (#2114) * updated daocreator version * updated package lock * fix SchemeFactory case for copying params (#2121) * Fix bad ui when using autocomplete input in chrome (#2127) * fix bad ui when using autocomplete input in chrome * changes * fix misplaced against vote button (#2123) * fix vote feedback alignment (#2128) * Eliminate fortawesome (#2129) * eliminate fortawesome * Update github.svg New line at EOF * missing fortawesome for dao creator * fix bad layout of an icon on Safari * Create CODEOWNERS * updated arc.js version to 55 (#2130) Co-authored-by: roienatan <[email protected]> Co-authored-by: Doug Kent <[email protected]>
daostack · Sep 12, 2020 · f62356e · f62356e
1 parent b3f466f
commit f62356e
Show file tree

Hide file tree

Showing 31 changed files with 2,520 additions and 1,892 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,7 @@
+# See https://help.github.com/articles/about-codeowners/
+# for more info about CODEOWNERS file
+
+# It uses the same pattern rule for gitignore file
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+*   @orenyodfat @roienatan
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -46,18 +46,18 @@ services:
       GRAPH_GRAPHQL_MAX_FIRST: 1000
 
   ipfs:
-    image: daostack/test-env-experimental-ipfs:4.0.18
+    image: daostack/test-env-experimental-ipfs:4.0.20
     ports:
       - 5001:5001
 
   postgres:
-    image: daostack/test-env-experimental-postgres:4.0.18
+    image: daostack/test-env-experimental-postgres:4.0.20
     ports:
       - 9432:5432
     environment:
       POSTGRES_PASSWORD: 'letmein'
 
   ganache:
-    image: daostack/test-env-experimental-ganache:4.0.18
+    image: daostack/test-env-experimental-ganache:4.0.20
     ports:
       - 8545:8545
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,11 +79,8 @@
   "dependencies": {
     "3box": "^1.20.3",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
-    "@daostack/arc.js": "2.0.0-experimental.50",
-    "@dorgtech/daocreator-ui-experimental": "1.1.12",
-    "@fortawesome/fontawesome-svg-core": "^1.2.10",
-    "@fortawesome/free-brands-svg-icons": "^5.6.1",
-    "@fortawesome/react-fontawesome": "^0.1.3",
+    "@daostack/arc.js": "2.0.0-experimental.55",
+    "@dorgtech/daocreator-ui-experimental": "1.1.13",
     "@portis/web3": "^2.0.0-beta.56",
     "@sentry/browser": "^5.0.8",
     "@toruslabs/torus-embed": "^1.8.1",
@@ -150,7 +147,7 @@
   },
   "devDependencies": {
     "@babel/plugin-syntax-dynamic-import": "^7.7.4",
-    "@daostack/test-env-experimental": "4.0.18",
+    "@daostack/test-env-experimental": "4.0.20",
     "@storybook/addon-info": "^5.0.10",
     "@storybook/react": "^5.0.10",
     "@types/chai": "^4.1.7",
@@ -191,7 +188,7 @@
     "@wdio/dot-reporter": "^6.1.9",
     "@wdio/local-runner": "^6.1.12",
     "@wdio/mocha-framework": "^6.1.8",
-    "@wdio/selenium-standalone-service": "^6.0.16",
+    "@wdio/selenium-standalone-service": "^6.4.0",
     "@wdio/spec-reporter": "^6.1.12",
     "awesome-typescript-loader": "^5.2.1",
     "axios-mock-adapter": "^1.16.0",
@@ -223,7 +220,7 @@
     "typescript": "^3.6.3",
     "typings-for-css-modules-loader": "^1.7.0",
     "uglifyjs-webpack-plugin": "^2.2.0",
-    "webdriverio": "^6.1.12",
+    "webdriverio": "^6.4.5",
     "webpack": "^4.44.0",
     "webpack-bundle-analyzer": "^3.6.1",
     "webpack-cli": "^3.2.1",

diff --git a/src/assets/images/Icon/social/github.svg b/src/assets/images/Icon/social/github.svg
diff --git a/src/assets/images/Icon/social/twitter.svg b/src/assets/images/Icon/social/twitter.svg
diff --git a/src/assets/locales/en/translation.json b/src/assets/locales/en/translation.json
@@ -28,9 +28,21 @@
     "ETH Balance": "ETH Balance",
     "Members": "Members",
     "Plugin activation time": "The plugin will be activated at",
+    "Total Holdings": "Total Holdings",
+    "Create A DAO": "Create A DAO",
+    "Your DAOs": "Your DAOs",
+    "Other DAOs": "Other DAOs",
+    "All DAOs": "All DAOs",
+    "Open Proposals": "Open Proposals",
     "3BoxLoginSuccess": "Logged in to 3Box",
     "3BoxProfileSuccess": "Profile data saved to 3Box",
     "Following": "Now following",
     "UnFollowing": "No longer following",
-    "Raw call data": "Raw call data"
+    "Raw call data": "Raw call data",
+    "Address": "Address:",
+    "Funding": "Funding:",
+    "Reputation Minted": "Reputation Minted:",
+    "Minimum DAO bounty": "Minimum DAO bounty:",
+    "Amount": "Amount:",
+    "Amount Redeemed": "Amount Redeemed:"
 }
diff --git a/src/components/Account/Account.scss b/src/components/Account/Account.scss
@@ -284,8 +284,11 @@ a.accountName {
 }
 
 .socialButtonAuthenticated {
+  display: flex;
   .icon {
-    color: #76c9de;
+    width: 20px;
+    height: 20px;
+    margin-right: 10px;
   }
 }
 

diff --git a/src/components/Account/AccountPopup.tsx b/src/components/Account/AccountPopup.tsx
@@ -1,6 +1,5 @@
 import { Address, IDAOState, Member, IMemberState } from "@daostack/arc.js";
 import { getArc } from "arc";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { getProfile } from "actions/profilesActions";
 import AccountImage from "components/Account/AccountImage";
 import AccountProfileName from "components/Account/AccountProfileName";
@@ -80,11 +79,11 @@ class AccountPopup extends React.Component<IProps, null> {
               <span>
                 {profile.socialURLs.twitter ?
                   <a href={"https://twitter.com/" + profile.socialURLs.twitter.username} className={css.socialButton} target="_blank" rel="noopener noreferrer">
-                    <FontAwesomeIcon icon={["fab", "twitter"]} className={css.icon} />
+                    <img src='/assets/images/Icon/social/twitter.svg' className={css.icon} />
                   </a> : ""}
                 {profile.socialURLs.github ?
                   <a href={"https://github.com/" + profile.socialURLs.github.username} className={css.socialButton} target="_blank" rel="noopener noreferrer">
-                    <FontAwesomeIcon icon={["fab", "github"]} className={css.icon} />
+                    <img src='/assets/images/Icon/social/github.svg' className={css.icon} />
                   </a> : ""}
               </span>
             }

diff --git a/src/components/Account/AccountProfilePage.tsx b/src/components/Account/AccountProfilePage.tsx
@@ -1,6 +1,4 @@
 import { IDAOState, IMemberState, DAO, Member } from "@daostack/arc.js";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
 import BN = require("bn.js");
 import { getProfile, updateProfile } from "actions/profilesActions";
 import { enableWalletProvider, getArc, getAccountIsEnabled } from "arc";
@@ -282,11 +280,11 @@ class AccountProfilePage extends React.Component<IProps, IState> {
                         }
 
                         <a href={accountProfile.socialURLs.twitter ? "https://twitter.com/" + accountProfile.socialURLs.twitter.username : "https://3box.io/" + accountAddress} className={css.socialButtonAuthenticated} target="_blank" rel="noopener noreferrer">
-                          <FontAwesomeIcon icon={["fab", "twitter"]} className={css.icon} /> {accountProfile.socialURLs.twitter ? "Verified as https://twitter.com/" + accountProfile.socialURLs.twitter.username : "Verify Twitter through 3box"}
+                          <img src='/assets/images/Icon/social/twitter.svg' className={css.icon} /> {accountProfile.socialURLs.twitter ? "Verified as https://twitter.com/" + accountProfile.socialURLs.twitter.username : "Verify Twitter through 3box"}
                         </a>
                         <br/>
                         <a href={accountProfile.socialURLs.github ? "https://github.com/" + accountProfile.socialURLs.github.username : "https://3box.io/" + accountAddress} className={css.socialButtonAuthenticated} target="_blank" rel="noopener noreferrer">
-                          <FontAwesomeIcon icon={["fab", "github"]} className={css.icon} /> {accountProfile.socialURLs.github ? "Verified as https://github.com/" + accountProfile.socialURLs.github.username : "Verify Github through 3box"}
+                          <img src='/assets/images/Icon/social/github.svg' className={css.icon} /> {accountProfile.socialURLs.github ? "Verified as https://github.com/" + accountProfile.socialURLs.github.username : "Verify Github through 3box"}
                         </a>
                       </div>
                     }

diff --git a/src/components/Dao/DaoMember.tsx b/src/components/Dao/DaoMember.tsx
@@ -1,6 +1,5 @@
 import BN = require("bn.js");
 import { IDAOState, IMemberState, Member } from "@daostack/arc.js";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import AccountImage from "components/Account/AccountImage";
 import AccountProfileName from "components/Account/AccountProfileName";
 import Reputation from "components/Account/Reputation";
@@ -67,11 +66,11 @@ class DaoMember extends React.Component<IProps, null> {
                     <span>
                       { profile.socialURLs.twitter ?
                         <span onClick={this.openSocial("https://twitter.com/" + profile.socialURLs.twitter.username)} className={css.socialButton}>
-                          <FontAwesomeIcon icon={["fab", "twitter"]} className={css.icon} />
+                          <img src='/assets/images/Icon/social/twitter.svg' className={css.icon} />
                         </span> : ""}
                       { profile.socialURLs.github ?
                         <span onClick={this.openSocial("https://github.com/" + profile.socialURLs.github.username)} className={css.socialButton}>
-                          <FontAwesomeIcon icon={["fab", "github"]} className={css.icon} />
+                          <img src='/assets/images/Icon/social/github.svg' className={css.icon} />
                         </span> : ""}
                     </span>
                     : ""

diff --git a/src/components/Daos/DaoCard.tsx b/src/components/Daos/DaoCard.tsx
@@ -7,18 +7,17 @@ import * as moment from "moment";
 import * as React from "react";
 import { Link } from "react-router-dom";
 import * as css from "./Daos.scss";
-import { formatTokens } from "lib/util";
-import BN = require("bn.js");
 import i18next from "i18next";
 
 interface IExternalProps {
   dao: DAO;
+  totalHoldings?: string;
 }
 
 type IProps = IExternalProps & ISubscriptionProps<IDAOState>
 
 const DaoCard = (props: IProps) => {
-  const { dao } = props;
+  const { dao, totalHoldings } = props;
   const daoState = props.data;
   const bgPattern = generate(dao.id + daoState.name);
   const dxDaoActivationDate = moment("2019-07-14T12:00:00.000+0000");
@@ -56,12 +55,12 @@ const DaoCard = (props: IProps) => {
                 </td>
                 <td><div className={css.daoInfo}>
                   <b>{daoState.numberOfQueuedProposals+ daoState.numberOfBoostedProposals + daoState.numberOfPreBoostedProposals}</b>
-                  <span>Open Proposals</span>
+                  <span>{i18next.t("Open Proposals")}</span>
                 </div>
                 </td>
                 <td><div className={css.daoInfo}>
-                  <b>{formatTokens(new BN(daoState.ethBalance))}</b>
-                  <span>ETH</span>
+                  <b>{totalHoldings}</b>
+                  <span>USD</span>
                 </div>
                 </td>
               </tr>

diff --git a/src/components/Daos/Daos.scss b/src/components/Daos/Daos.scss
@@ -24,21 +24,26 @@
     .searchBox {
       color: #4f6176;
       margin-right: 30px;
+      border-radius: 20px;
+      background: url("../../assets/images/Icon/search.svg") $white no-repeat left 5px center;
+      background-size: 20px;
+      padding-left: 30px;
       input {
         font-size: 15px;
         width: 425px;
-        border-radius: 20px;
         border: none;
-        text-indent: 30px;
         height: 30px;
-        background: url("../../assets/images/Icon/search.svg") $white no-repeat left 5px center;
-        background-size: 20px;
         font-family: "AccordBold", sans-serif;
+        margin-right: 20px;
       }
 
       input:focus {
         outline: none;
       }
+
+      input:-webkit-autofill {
+        transition: all 5000s ease-in-out 0s;
+      }      
     }
 
     .sortWrapper {
@@ -245,18 +250,11 @@
     }
 
     table.daoInfoContainer {
-      text-align: center;
-
+      table-layout: fixed;
       width: 100%;
       tr > td {
-        width: 40%;
-        border: 0;
         padding: 0;
       }
-      tr > td:first-child,
-      tr > td:last-child {
-        width: 10%;
-      }
     }
   }
 }