Merge branch 'dev' into release

daostack · Jan 20, 2021 · 9b80f83 · 9b80f83
2 parents b04a432 + cc1e380
commit 9b80f83
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 501 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@
 
   - Bugs Fixed
     - Bug where a scheme can be undefined due to an unknown issue
+    - Updated DAO creator:
+        - Can't create DAO in xDai
+        - New DAO URL is now lowercase
 
 ## 1.0.4
   - Features Added

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "3box": "1.20.2",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
     "@daostack/arc.js": "0.2.82",
-    "@dorgtech/daocreator-ui": "1.0.21",
+    "@dorgtech/daocreator-ui": "1.0.22",
     "@fortawesome/fontawesome-svg-core": "^1.2.10",
     "@fortawesome/free-brands-svg-icons": "^5.6.1",
     "@fortawesome/react-fontawesome": "^0.1.3",

diff --git a/src/components/DaoCreator/index.tsx b/src/components/DaoCreator/index.tsx
@@ -2,8 +2,6 @@ import * as React from "react";
 import { connect } from "react-redux";
 import { Prompt } from "react-router-dom";
 import { showNotification } from "@store/notifications/notifications.reducer";
-import { enableWalletProvider, getWeb3Provider } from "arc";
-import { getNetworkName } from "lib/util";
 
 const DAOcreator = React.lazy(() => import("@dorgtech/daocreator-ui"));
 
@@ -41,13 +39,6 @@ class DaoCreator extends React.Component<IProps> {
           message={"Are you sure you want to leave?"}
         />
         <DAOcreator
-          setWeb3Provider={async (): Promise<any> => {
-            if (!await enableWalletProvider({ showNotification: this.props.showNotification }, await getNetworkName())) {
-              return undefined;
-            }
-
-            return await getWeb3Provider();
-          }}
           noDAOstackLogo
           redirectURL={process.env.BASE_URL}
           networks={process.env.NETWORKS.replace("main", "mainnet")}

diff --git a/src/components/Proposal/Create/SchemeForms/Validators.ts b/src/components/Proposal/Create/SchemeForms/Validators.ts
@@ -42,7 +42,7 @@ export const requireValue = (value: any): string => {
  */
 export const validateParamValue = (type: string, value: string): undefined | string => {
   if (isAddressType(type)) {
-    if (!isAddress(value)) {
+    if (!isAddress(value, true)) {
       return "Must be a valid address";
     }
   }

diff --git a/src/components/Proposal/ProposalDetails.scss b/src/components/Proposal/ProposalDetails.scss
@@ -56,6 +56,7 @@ button.disabled {
   flex-grow: 2;
   padding-right: 25px;
   position: relative;
+  max-width: 1000px;
 
   .actionButtonContainer {
     display: inline-block;

diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryMultiCallGenericScheme.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryMultiCallGenericScheme.tsx
@@ -85,7 +85,7 @@ const DecodedData = (props: IDecodedDataProps) => {
     <div>
       {lodaing ? <div className={css.loadingMethodInfo}><div className={css.loader} /><i>Loading method info...</i></div> :
         <React.Fragment>
-          <div>Method: <pre>{parseMethodSignature(decodedData)}</pre></div>
+          <div>Method: <pre style={{ whiteSpace: "break-spaces" }}>{parseMethodSignature(decodedData)}</pre></div>
           {methodParams}
         </React.Fragment>}
     </div>

diff --git a/src/components/Proposal/Staking/StakeButtons.scss b/src/components/Proposal/Staking/StakeButtons.scss
@@ -209,9 +209,10 @@
 
   .enablePredictions {
     button {
-      width: 120px;
-      white-space: nowrap;
+      width: fit-content;
       height: auto;
+      padding-left: 10px;
+      padding-right: 10px;
     }
   }
 }