Merge branch 'dev' into release

CHANGELOG.md

@@ -1,10 +1,22 @@
+## 1.0.5
+  - Improvements
+     - Whitelist PrimeDAO Token
+     - Use arc.js 0.2.82
+     - Eliminate unnecessary WebSocket calls to the graph
+     - Some UI/UX improvements:
+        - New loader to match Alchemy color
+        - Rounded borders to proposals, votes and stakes cards in all 4 corners
+        - Eliminate DAOs pattern background and thinner cards (3 in a row)
+
+  - Bugs Fixed
+    - Bug where a scheme can be undefined due to an unknown issue
+
 ## 1.0.4
   - Features Added
     - Brand new Proposals Page
 
   - Improvements
     - Verify parameters hash
-    - Whitelist PrimeDAO Token
     - Use subgraph v41_4 and arc.js 0.2.80
     - Some UI/UX improvements
     - Alchemy 2.0 banners are removed

data/tokens.json

@@ -82,12 +82,12 @@
         "decimals": 18,
         "name": "Panvala pan",
         "symbol": "PAN"
+      },
+      "0xe59064a8185ed1fca1d17999621efedfab4425c9": {
+        "decimals": 18,
+        "name": "PrimeDAO Token",
+        "symbol": "PRIME"
       }
-    },
-    "0xe59064a8185ed1fca1d17999621efedfab4425c9": {
-      "decimals": 18,
-      "name": "PrimeDAO Token",
-      "symbol": "PRIME"
     }
   },
   "rinkeby": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy-client",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "An app for collaborative networks (DAOs), based on the DAO stack.",
   "author": "DAOstack",
   "license": "GPL-3.0",
@@ -35,16 +35,14 @@
     "moduleNameMapper": {
       "\\.(scss|css|less|svg|png|jpg)$": "identity-obj-proxy",
       "^arc": "<rootDir>/src/arc",
-      "^actions/(.*)$": "<rootDir>/src/actions/$1",
       "^components(.*)$": "<rootDir>/src/components$1",
+      "^@store(.*)$": "<rootDir>/src/@store$1",
       "^data/(.*)$": "<rootDir>/data/$1",
       "^genericSchemeRegistry(.*)$": "<rootDir>/src/genericSchemeRegistry$1",
       "^crxRegistry(.*)$": "<rootDir>/src/crxRegistry$1",
       "^layouts/(.*)$": "<rootDir>/src/layouts/$1",
       "^lib/(.*)$": "<rootDir>/src/lib/$1",
       "^pages": "<rootDir>/src/pages",
-      "^reducers/(.*)$": "<rootDir>/src/reducers/$1",
-      "^selectors/(.*)$": "<rootDir>/src/selectors/$1",
       "^src/(.*)$": "<rootDir>/src/$1"
     },
     "setupFiles": [
@@ -81,7 +79,7 @@
   "dependencies": {
     "3box": "1.20.2",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
-    "@daostack/arc.js": "0.2.80",
+    "@daostack/arc.js": "0.2.82",
     "@dorgtech/daocreator-ui": "1.0.21",
     "@fortawesome/fontawesome-svg-core": "^1.2.10",
     "@fortawesome/free-brands-svg-icons": "^5.6.1",

src/actions/arcActions.ts → src/@store/arc/arcActions.ts

@@ -1,9 +1,9 @@
 import { Address, DAO, IProposalCreateOptions, IProposalOutcome, ITransactionState, ITransactionUpdate, ReputationFromTokenScheme, Scheme } from "@daostack/arc.js";
-import { IAsyncAction } from "actions/async";
+import { IAsyncAction } from "@store/async";
 import { toWei, getArcByDAOAddress } from "lib/util";
 import { IRedemptionState } from "lib/proposalHelpers";
-import { IRootState } from "reducers/index";
-import { NotificationStatus, showNotification } from "reducers/notifications";
+import { IRootState } from "@store/index";
+import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer";
 import * as Redux from "redux";
 import { ThunkAction } from "redux-thunk";
 

src/reducers/index.ts → src/@store/index.ts

@@ -1,9 +1,9 @@
 import { routerReducer } from "react-router-redux";
 import { combineReducers } from "redux";
-import { INotificationsState, notificationsReducer } from "./notifications";
-import profilesReducer, { IProfilesState } from "./profilesReducer";
-import uiReducer, { IUIState } from "./uiReducer";
-import web3Reducer, { IWeb3State } from "./web3Reducer";
+import { INotificationsState, notificationsReducer } from "@store/notifications/notifications.reducer";
+import profilesReducer, { IProfilesState } from "@store/profiles/profilesReducer";
+import uiReducer, { IUIState } from "@store/ui/uiReducer";
+import web3Reducer, { IWeb3State } from "@store/web3/web3Reducer";
 
 export interface IRootState {
   notifications: INotificationsState;

src/selectors/notifications.ts → src/@store/notifications/notifications.ts

@@ -1,6 +1,6 @@
-import { INotificationsState, INotification } from "reducers/notifications";
+import { INotificationsState, INotification } from "@store/notifications/notifications.reducer";
 import { createSelector } from "reselect";
-import { IRootState } from "../reducers";
+import { IRootState } from "@store/index";
 
 const notifications = (state: IRootState): INotificationsState => state.notifications;
 

src/actions/profilesActions.ts → src/@store/profiles/profilesActions.ts

@@ -1,11 +1,11 @@
 import * as Box from "3box";
 
-import { AsyncActionSequence, IAsyncAction } from "actions/async";
+import { AsyncActionSequence, IAsyncAction } from "@store/async";
 import { getWeb3Provider } from "arc";
 import Analytics from "lib/analytics";
 
-import { NotificationStatus, showNotification } from "reducers/notifications";
-import { ActionTypes, FollowType, newProfile } from "reducers/profilesReducer";
+import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer";
+import { ActionTypes, FollowType, newProfile } from "@store/profiles/profilesReducer";
 import { arrayRemove } from "lib/util";
 
 // Load account profile data from our database for all the "members" of the DAO

src/reducers/profilesReducer.ts → src/@store/profiles/profilesReducer.ts

@@ -1,6 +1,6 @@
 import * as update from "immutability-helper";
 
-import { AsyncActionSequence } from "actions/async";
+import { AsyncActionSequence } from "@store/async";
 
 export enum ActionTypes {
   GET_PROFILE_DATA = "GET_PROFILE_DATA",

src/actions/uiActions.ts → src/@store/ui/uiActions.ts

@@ -1,7 +1,7 @@
 import * as Redux from "redux";
 
-import { IRootState } from "reducers";
-import { ActionTypes } from "reducers/uiReducer";
+import { IRootState } from "@store/index";
+import { ActionTypes } from "@store/ui/uiReducer";
 import { ISimpleMessagePopupProps } from "components/Shared/SimpleMessagePopup";
 
 export function showTour() {

src/actions/web3Actions.ts → src/@store/web3/web3Actions.ts

@@ -1,11 +1,12 @@
-import * as Sentry from "@sentry/browser";
-import { getProfile } from "actions/profilesActions";
 import { getWeb3ProviderInfo, getProviderNetworkName } from "arc";
+import * as Sentry from "@sentry/browser";
+import * as Redux from "redux";
+
 import Analytics from "lib/analytics";
-import { ActionTypes, IWeb3State } from "reducers/web3Reducer";
 
-import * as Redux from "redux";
-import { IAsyncAction } from "./async";
+import { IAsyncAction } from "@store/async";
+import { getProfile } from "@store/profiles/profilesActions";
+import { ActionTypes, IWeb3State } from "@store/web3/web3Reducer";
 
 export type ConnectAction = IAsyncAction<"WEB3_CONNECT", void, IWeb3State>;
 

src/arc.ts

@@ -1,4 +1,4 @@
-import { NotificationStatus } from "reducers/notifications";
+import { NotificationStatus } from "@store/notifications/notifications.reducer";
 import { getNetworkId, getNetworkName, targetedNetwork, targetNetworks, Networks } from "./lib/util";
 import { settings } from "./settings";
 import { Address, Arc } from "@daostack/arc.js";

src/components/Account/AccountImage.tsx

@@ -1,6 +1,6 @@
 import { createDataURL } from "ethereum-blockies-png";
 import * as React from "react";
-import { IProfileState } from "reducers/profilesReducer";
+import { IProfileState } from "@store/profiles/profilesReducer";
 
 import * as css from "./Account.scss";
 

src/components/Account/AccountPopup.tsx

@@ -1,6 +1,6 @@
 import { Address, IDAOState, IMemberState } from "@daostack/arc.js";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { getProfile } from "actions/profilesActions";
+import { getProfile } from "@store/profiles/profilesActions";
 import AccountImage from "components/Account/AccountImage";
 import AccountProfileName from "components/Account/AccountProfileName";
 import Reputation from "components/Account/Reputation";
@@ -9,8 +9,8 @@ import withSubscription, { ISubscriptionProps } from "components/Shared/withSubs
 import CopyToClipboard, { IconColor } from "components/Shared/CopyToClipboard";
 import * as React from "react";
 import { connect } from "react-redux";
-import { IRootState } from "reducers";
-import { IProfileState } from "reducers/profilesReducer";
+import { IRootState } from "@store";
+import { IProfileState } from "@store/profiles/profilesReducer";
 
 import * as BN from "bn.js";
 

src/components/Account/AccountProfileName.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { Link } from "react-router-dom";
 
-import { IProfileState } from "reducers/profilesReducer";
+import { IProfileState } from "@store/profiles/profilesReducer";
 
 import * as classNames from "classnames";
 

src/components/Account/AccountProfilePage.tsx

@@ -1,6 +1,6 @@
 import { IDAOState, IMemberState, DAO } from "@daostack/arc.js";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { getProfile, updateProfile } from "actions/profilesActions";
+import { getProfile, updateProfile } from "@store/profiles/profilesActions";
 import { enableWalletProvider } from "arc";
 import classNames from "classnames";
 import AccountImage from "components/Account/AccountImage";
@@ -19,9 +19,9 @@ import { BreadcrumbsItem } from "react-breadcrumbs-dynamic";
 import { Helmet } from "react-helmet";
 import { connect } from "react-redux";
 import { RouteComponentProps } from "react-router-dom";
-import { IRootState } from "reducers";
-import { showNotification } from "reducers/notifications";
-import { IProfileState } from "reducers/profilesReducer";
+import { IRootState } from "@store";
+import { showNotification } from "@store/notifications/notifications.reducer";
+import { IProfileState } from "@store/profiles/profilesReducer";
 import { combineLatest, of } from "rxjs";
 import Loading from "components/Shared/Loading";
 import * as css from "./Account.scss";

src/components/Buidlhub/Registration.tsx

@@ -1,7 +1,7 @@
 import * as css from "./Registration.scss";
 import * as React from "react";
 import {connect} from "react-redux";
-import { IRootState } from "reducers";
+import { IRootState } from "@store";
 import cn from "classnames";
 import BuidlhubClient, {IBuidlhubClient} from "./BuidlhubClient";
 

src/components/Dao/DaoContainer.tsx

@@ -1,5 +1,5 @@
 import { IDAOState, Member, Scheme } from "@daostack/arc.js";
-import { getProfilesForAddresses } from "actions/profilesActions";
+import { getProfilesForAddresses } from "@store/profiles/profilesActions";
 import CreateProposalPage from "components/Proposal/Create";
 import ProposalDetailsPage from "components/Proposal/ProposalDetailsPage";
 import SchemeContainer from "components/Scheme/SchemeContainer";
@@ -11,9 +11,9 @@ import { Helmet } from "react-helmet";
 import { connect } from "react-redux";
 import { Route, RouteComponentProps, Switch } from "react-router-dom";
 import { ModalRoute } from "react-router-modal";
-import { IRootState } from "reducers";
-import { showNotification } from "reducers/notifications";
-import { IProfileState } from "reducers/profilesReducer";
+import { IRootState } from "@store";
+import { showNotification } from "@store/notifications/notifications.reducer";
+import { IProfileState } from "@store/profiles/profilesReducer";
 import DetailsPageRouter from "components/Scheme/ContributionRewardExtRewarders/DetailsPageRouter";
 import { combineLatest, Subscription } from "rxjs";
 import DaoSchemesPage from "./DaoSchemesPage";

src/components/Dao/DaoMember.tsx

@@ -8,7 +8,7 @@ import withSubscription, { ISubscriptionProps } from "components/Shared/withSubs
 import { fromWei } from "lib/util";
 import * as React from "react";
 import { Link } from "react-router-dom";
-import { IProfileState } from "reducers/profilesReducer";
+import { IProfileState } from "@store/profiles/profilesReducer";
 import * as css from "./Dao.scss";
 
 interface IProps extends ISubscriptionProps<IMemberState> {

src/components/Dao/DaoMembersPage.tsx

@@ -1,5 +1,5 @@
 import { IDAOState, Member } from "@daostack/arc.js";
-import { getProfile } from "actions/profilesActions";
+import { getProfile } from "@store/profiles/profilesActions";
 import Loading from "components/Shared/Loading";
 import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription";
 import Analytics from "lib/analytics";
@@ -10,8 +10,8 @@ import InfiniteScroll from "react-infinite-scroll-component";
 import { connect } from "react-redux";
 import { RouteComponentProps } from "react-router-dom";
 import * as Sticky from "react-stickynode";
-import { IRootState } from "reducers";
-import { IProfilesState } from "reducers/profilesReducer";
+import { IRootState } from "@store";
+import { IProfilesState } from "@store/profiles/profilesReducer";
 
 import DaoMember from "./DaoMember";
 import * as css from "./Dao.scss";

src/components/Dao/DaoSchemesPage.tsx

@@ -19,7 +19,7 @@ import { RouteComponentProps } from "react-router-dom";
 import * as Sticky from "react-stickynode";
 import { CSSTransition, TransitionGroup } from "react-transition-group";
 import { connect } from "react-redux";
-import { showNotification } from "reducers/notifications";
+import { showNotification } from "@store/notifications/notifications.reducer";
 import { combineLatest, Observable, of } from "rxjs";
 import { mergeMap } from "rxjs/operators";
 import * as css from "./DaoSchemesPage.scss";

src/components/DaoCreator/index.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { connect } from "react-redux";
 import { Prompt } from "react-router-dom";
-import { showNotification } from "reducers/notifications";
+import { showNotification } from "@store/notifications/notifications.reducer";
 import { enableWalletProvider, getWeb3Provider } from "arc";
 import { getNetworkName } from "lib/util";