Skip to content

Commit 775064d

Browse files
committed
Merge branch 'dev' into support-cl4r
2 parents 9c40e2e + cc1e380 commit 775064d

File tree

8 files changed

+103
-504
lines changed

8 files changed

+103
-504
lines changed

CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
1+
## 1.0.5
2+
- Improvements
3+
- Whitelist PrimeDAO Token
4+
- Use arc.js 0.2.82
5+
- Eliminate unnecessary WebSocket calls to the graph
6+
- Some UI/UX improvements:
7+
- New loader to match Alchemy color
8+
- Rounded borders to proposals, votes and stakes cards in all 4 corners
9+
- Eliminate DAOs pattern background and thinner cards (3 in a row)
10+
11+
- Bugs Fixed
12+
- Bug where a scheme can be undefined due to an unknown issue
13+
- Updated DAO creator:
14+
- Can't create DAO in xDai
15+
- New DAO URL is now lowercase
16+
117
## 1.0.4
218
- Features Added
319
- Brand new Proposals Page
420

521
- Improvements
622
- Verify parameters hash
7-
- Whitelist PrimeDAO Token
823
- Use subgraph v41_4 and arc.js 0.2.80
924
- Some UI/UX improvements
1025
- Alchemy 2.0 banners are removed

package-lock.json

Lines changed: 79 additions & 488 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "alchemy-client",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"description": "An app for collaborative networks (DAOs), based on the DAO stack.",
55
"author": "DAOstack",
66
"license": "GPL-3.0",
@@ -80,7 +80,7 @@
8080
"3box": "1.20.2",
8181
"@burner-wallet/burner-connect-provider": "^0.1.1",
8282
"@daostack/arc.js": "0.2.87",
83-
"@dorgtech/daocreator-ui": "1.0.21",
83+
"@dorgtech/daocreator-ui": "1.0.22",
8484
"@fortawesome/fontawesome-svg-core": "^1.2.10",
8585
"@fortawesome/free-brands-svg-icons": "^5.6.1",
8686
"@fortawesome/react-fontawesome": "^0.1.3",

src/components/DaoCreator/index.tsx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import * as React from "react";
22
import { connect } from "react-redux";
33
import { Prompt } from "react-router-dom";
44
import { showNotification } from "@store/notifications/notifications.reducer";
5-
import { enableWalletProvider, getWeb3Provider } from "arc";
6-
import { getNetworkName } from "lib/util";
75

86
const DAOcreator = React.lazy(() => import("@dorgtech/daocreator-ui"));
97

@@ -41,13 +39,6 @@ class DaoCreator extends React.Component<IProps> {
4139
message={"Are you sure you want to leave?"}
4240
/>
4341
<DAOcreator
44-
setWeb3Provider={async (): Promise<any> => {
45-
if (!await enableWalletProvider({ showNotification: this.props.showNotification }, await getNetworkName())) {
46-
return undefined;
47-
}
48-
49-
return await getWeb3Provider();
50-
}}
5142
noDAOstackLogo
5243
redirectURL={process.env.BASE_URL}
5344
networks={process.env.NETWORKS.replace("main", "mainnet")}

src/components/Proposal/Create/SchemeForms/Validators.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const requireValue = (value: any): string => {
4242
*/
4343
export const validateParamValue = (type: string, value: string): undefined | string => {
4444
if (isAddressType(type)) {
45-
if (!isAddress(value)) {
45+
if (!isAddress(value, true)) {
4646
return "Must be a valid address";
4747
}
4848
}

src/components/Proposal/ProposalDetails.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ button.disabled {
5656
flex-grow: 2;
5757
padding-right: 25px;
5858
position: relative;
59+
max-width: 1000px;
5960

6061
.actionButtonContainer {
6162
display: inline-block;

src/components/Proposal/ProposalSummary/ProposalSummaryMultiCallGenericScheme.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const DecodedData = (props: IDecodedDataProps) => {
8585
<div>
8686
{lodaing ? <div className={css.loadingMethodInfo}><div className={css.loader} /><i>Loading method info...</i></div> :
8787
<React.Fragment>
88-
<div>Method: <pre>{parseMethodSignature(decodedData)}</pre></div>
88+
<div>Method: <pre style={{ whiteSpace: "break-spaces" }}>{parseMethodSignature(decodedData)}</pre></div>
8989
{methodParams}
9090
</React.Fragment>}
9191
</div>

src/components/Proposal/Staking/StakeButtons.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@
209209

210210
.enablePredictions {
211211
button {
212-
width: 120px;
213-
white-space: nowrap;
212+
width: fit-content;
214213
height: auto;
214+
padding-left: 10px;
215+
padding-right: 10px;
215216
}
216217
}
217218
}

0 commit comments

Comments
 (0)