Merge pull request #1517 from daostack/dev

release-0.10.2

CHANGELOG.md

@@ -2,6 +2,13 @@
   - Features Added
   - Bugs Fixed
 
+## 0.10.2
+  - Features Added
+    - Fix bug when entering numbers for uint256 data types in the GenericScheme new proposal modal
+    - New busy waiting animation
+
+  - Bugs Fixed
+
 ## 0.10.1
 
   - Features Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy-client",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "An app for collaborative networks (DAOs), based on the DAO stack.",
   "author": "DAOstack",
   "license": "GPL-3.0",
@@ -75,7 +75,7 @@
     "test:unit": "jest"
   },
   "dependencies": {
-    "3box": "^1.16.1",
+    "3box": "1.16.1",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
     "@daostack/client": "0.2.64",
     "@dorgtech/daocreator-ui-v1": "^1.0.0-beta.1",
@@ -104,6 +104,7 @@
     "interweave": "^11.1.0",
     "mixpanel-browser": "^2.29.0",
     "moment-timezone": "^0.5.27",
+    "multicodec": "0.5.6",
     "query-string": "^6.2.0",
     "rc-tooltip": "^3.7.3",
     "react": "^16.8.0",
@@ -217,9 +218,9 @@
     "ts-jest": "^24.1.0",
     "typescript": "^3.6.3",
     "typings-for-css-modules-loader": "^1.7.0",
-    "uglifyjs-webpack-plugin": "^1.3.0",
+    "uglifyjs-webpack-plugin": "^2.2.0",
     "webdriverio": "^5.11.6",
-    "webpack-bundle-analyzer": "^3.0.3",
+    "webpack-bundle-analyzer": "^3.6.1",
     "webpack-cli": "^3.2.1",
     "webpack-dev-server": "^3.1.14",
     "webpack-merge": "^4.1.5",

src/App.tsx

@@ -108,7 +108,7 @@ export class App extends React.Component<{}, {
           { this.state.retryingArc ?
             <div className={css.waitingToInitMessage}>Waiting to connect to the blockchain.  If this is taking a while, please ensure that you have a good internet connection.</div> : ""
           }
-          <div className={css.loading}><Loading/></div>
+          <Loading/>
         </div>
       );
     } else  {

src/components/Account/Account.scss

@@ -1,9 +1,3 @@
-.loading {
-  font-size: 18px;
-  margin-top: 24px;
-  margin-left: 24px;
-}
-
 .accountBalance {
   text-align: right;
 }

src/components/Account/AccountProfilePage.tsx

@@ -24,6 +24,7 @@ import { IRootState } from "reducers";
 import { NotificationStatus, showNotification } from "reducers/notifications";
 import { IProfileState } from "reducers/profilesReducer";
 import { combineLatest, of } from "rxjs";
+import Loading from "components/Shared/Loading";
 import * as css from "./Account.scss";
 
 type IExternalProps = RouteComponentProps<any>;
@@ -142,7 +143,7 @@ class AccountProfilePage extends React.Component<IProps, IState> {
     const { accountAddress, accountProfile, currentAccountAddress } = this.props;
 
     if (!accountProfile) {
-      return <div className={css.loading}>Loading...</div>;
+      return <Loading/>;
     }
 
     // TODO: dont show profile until loaded from 3box
@@ -312,7 +313,7 @@ class AccountProfilePage extends React.Component<IProps, IState> {
 
 const SubscribedAccountProfilePage = withSubscription({
   wrappedComponent: AccountProfilePage,
-  loadingComponent: <div className={css.loading}>Loading...</div>,
+  loadingComponent: <Loading/>,
   errorComponent: (props) => <div>{props.error.message}</div>,
 
   checkForUpdate: (oldProps, newProps) => {

src/components/Dao/Dao.scss

@@ -1,11 +1,3 @@
-.loading {
-  width: 100%;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-
 button:hover {
   cursor: pointer;
 }
@@ -175,11 +167,6 @@ button:hover {
   }
 }
 
-.loading img {
-  margin: 0 auto;
-  display: block;
-}
-
 .membersContainer {
   margin: 10px auto;
   max-width: 980px;

src/components/Dao/DaoContainer.tsx

@@ -141,7 +141,7 @@ class DaoContainer extends React.Component<IProps, null> {
 
 const SubscribedDaoContainer = withSubscription({
   wrappedComponent: DaoContainer,
-  loadingComponent: <div className={css.loading}><Loading/></div>,
+  loadingComponent: <Loading/>,
   errorComponent: (props) => <div>{props.error.message}</div>,
   checkForUpdate: ["daoAvatarAddress"],
   createObservable: (props: IExternalProps) => {

src/components/Dao/DaoHistoryPage.tsx

@@ -96,7 +96,7 @@ class DaoHistoryPage extends React.Component<IProps, null> {
 
 export default withSubscription({
   wrappedComponent: DaoHistoryPage,
-  loadingComponent: <div className={css.loading}><Loading/></div>,
+  loadingComponent: <Loading/>,
   errorComponent: (props) => <div>{ props.error.message }</div>,
 
   checkForUpdate: [],

src/components/Dao/DaoMember.tsx

@@ -88,7 +88,7 @@ class DaoMember extends React.Component<IProps, null> {
 
 export default withSubscription({
   wrappedComponent: DaoMember,
-  loadingComponent: <div className={css.loading}>Loading...</div>,
+  loadingComponent: <div>Loading...</div>,
   errorComponent: (props) => <div>{ props.error.message }</div>,
   checkForUpdate: (oldProps, newProps) => { return oldProps.member.id !== newProps.member.id; },
   createObservable: (props: IProps) => props.member.state(),

src/components/Dao/DaoMembersPage.tsx

@@ -106,7 +106,7 @@ class DaoMembersPage extends React.Component<IProps, null> {
 
 const SubscribedDaoMembersPage = withSubscription({
   wrappedComponent: DaoMembersPage,
-  loadingComponent: <div className={css.loading}><Loading/></div>,
+  loadingComponent: <Loading/>,
   errorComponent: (props) => <div>{ props.error.message }</div>,
 
   checkForUpdate: [], // (oldProps, newProps) => { return oldProps.daoState.address !== newProps.daoState.address; },

src/components/Dao/DaoSchemesPage.scss

@@ -2,23 +2,15 @@
   width: 100%;
 
   h1 {
-    color: rgba(104, 155, 214, 1.000);
-    border-bottom: 1px solid rgba(195, 212, 231, 1.000);
+    color: rgba(104, 155, 214, 1);
+    border-bottom: 1px solid rgba(195, 212, 231, 1);
     width: 100%;
     padding-top: 30px;
-    background-color: rgba(229, 235, 242, 1.000);
+    background-color: rgba(229, 235, 242, 1);
     margin: 0;
   }
 }
 
-.loading {
-  width: 100%;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%,-50%)
-}
-
 .fadeEnter {
   opacity: 0.01;
 }
@@ -41,9 +33,8 @@
   padding-top: 30px;
 }
 
-
 @media only screen and (max-width: 425px) {
   .wrapper h1 {
     padding-left: 10px;
   }
-}
+}

src/components/Dao/DaoSchemesPage.tsx

@@ -100,7 +100,7 @@ class DaoSchemesPage extends React.Component<IProps, null> {
 
 export default withSubscription({
   wrappedComponent: DaoSchemesPage,
-  loadingComponent: <div className={css.loading}><Loading/></div>,
+  loadingComponent: <Loading/>,
   errorComponent: (props) => <span>{props.error.message}</span>,
   checkForUpdate: [],
   createObservable: (props: IExternalProps) => {

src/components/Dao/ProposalSchemeCard.tsx

@@ -80,7 +80,7 @@ const ProposalSchemeCard = (props: IProps) => {
 
 export default withSubscription({
   wrappedComponent: ProposalSchemeCard,
-  loadingComponent: <div><Loading/></div>,
+  loadingComponent: <Loading/>,
   errorComponent: (props) => <div>{ props.error.message }</div>,
 
   checkForUpdate: (oldProps: IExternalProps, newProps: IExternalProps) => {