Skip to content

Commit 5862e77

Browse files
dkent600dkent600
authored
Merge pull request #2143 from daostack/release
Release v0.10.16
2 parents c34fa62 + d74c8b2 commit 5862e77

17 files changed

+2148
-1668
lines changed

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 0.10.16
2+
- Features Added
3+
- show account holdings even when out of scope of a DAO
4+
- remove email notifications signup button on xDAI
5+
- whitelist the PAN token
6+
- add ability to filter proposal history by proposal title text
7+
8+
- Bugs Fixed
9+
- properly report on why you can't vote or stake once the proposal is executed
10+
- fix ability to redeem contribution rewards on Kovan
11+
112
## 0.10.15
213
- Features Added
314
- update subgraph endpoints

‎data/tokens.json

+5
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
"decimals": 18,
7878
"name": "DMM: Governance",
7979
"symbol": "DMG"
80+
},
81+
"0xd56dac73a4d6766464b38ec6d91eb45ce7457c44": {
82+
"decimals": 18,
83+
"name": "Panvala pan",
84+
"symbol": "PAN"
8085
}
8186
}
8287
},

‎package-lock.json

+1,743-1,362
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "alchemy-client",
3-
"version": "0.10.15",
3+
"version": "0.10.16",
44
"description": "An app for collaborative networks (DAOs), based on the DAO stack.",
55
"author": "DAOstack",
66
"license": "GPL-3.0",
@@ -68,8 +68,8 @@
6868
"start-prod": "cross-env NODE_ENV=production SHOW_ALL_DAOS=false NETWORK=main node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
6969
"start-staging-kovan": "cross-env NODE_ENV=production SHOW_ALL_DAOS=true NETWORK=kovan node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
7070
"start-staging-rinkeby": "cross-env NODE_ENV=production SHOW_ALL_DAOS=true NETWORK=rinkeby node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
71+
"start-staging-xdai": "cross-env NODE_ENV=production SHOW_ALL_DAOS=true NETWORK=xdai node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
7172
"start-staging": "npm run start-staging-rinkeby",
72-
"start-xdai": "cross-env NODE_ENV=production SHOW_ALL_DAOS=true NETWORK=xdai node --max_old_space_size=4096 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js --config webpack.dev.config.js",
7373
"storybook": "start-storybook",
7474
"test": "wdio ./test/integration/wdio.conf.js",
7575
"test:integration": "wdio ./test/integration/wdio.conf.js --inspect",
@@ -79,7 +79,7 @@
7979
"dependencies": {
8080
"3box": "1.17.1",
8181
"@burner-wallet/burner-connect-provider": "^0.1.1",
82-
"@daostack/arc.js": "^0.2.72",
82+
"@daostack/arc.js": "0.2.73",
8383
"@dorgtech/daocreator-ui": "^1.0.13",
8484
"@fortawesome/fontawesome-svg-core": "^1.2.10",
8585
"@fortawesome/free-brands-svg-icons": "^5.6.1",

‎src/assets/images/Icon/search.svg

+1
Loading

‎src/components/Account/AccountBalances.tsx

+26-29
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,41 @@ interface IExternalProps {
1515
address: Address;
1616
}
1717

18-
type IProps = IExternalProps & ISubscriptionProps<[IMemberState, BN|null, BN|null]>
18+
type IProps = IExternalProps & ISubscriptionProps<[Address, IMemberState, BN|null, BN|null]>
1919

2020
class AccountBalances extends React.Component<IProps, null> {
2121

2222
public render(): RenderOutput {
2323
const { dao, data } = this.props;
2424

25-
if (!data) {
26-
return null;
27-
}
28-
29-
const [currentAccountState, ethBalance, genBalance] = data;
25+
const [currentAccountAddress, currentAccountState, ethBalance, genBalance] = data;
3026

3127
return (
3228
<div className={css.balances}>
33-
<h2>Reputation</h2>
34-
{ dao ?
35-
<div className={css.daoBalance}>
36-
<b>{dao.name}</b>
37-
<Reputation daoName={dao.name} totalReputation={dao.reputationTotalSupply} reputation={currentAccountState.reputation} hideTooltip/>
38-
</div>
39-
:
40-
<div className={css.noReputation}>
41-
No Reputation
42-
</div>
29+
{ (dao && currentAccountState) ?
30+
<div className={css.repBalance}>
31+
<div className={css.heading}>Reputation</div>
32+
<div className={css.rep}>
33+
<div>{dao.name}</div>
34+
<div className={css.underline}></div>
35+
<div><Reputation daoName={dao.name} totalReputation={dao.reputationTotalSupply} reputation={currentAccountState.reputation} hideTooltip /></div>
36+
</div>
37+
</div> : dao ?
38+
<div className={css.noReputation}>
39+
No Reputation
40+
</div> : ""
4341
}
44-
<div className={css.userBalance}>
45-
<h2>Holdings</h2>
46-
<div>
47-
<AccountBalance tokenSymbol={baseTokenName()} balance={ethBalance} accountAddress={currentAccountState.address} />
48-
</div>
49-
<div>
50-
<AccountBalance tokenSymbol={genName()} balance={genBalance} accountAddress={currentAccountState.address} />
42+
{ currentAccountAddress ?
43+
<div className={css.userBalance}>
44+
<div className={css.heading}>Holdings</div>
45+
<div>
46+
<AccountBalance tokenSymbol={baseTokenName()} balance={ethBalance} accountAddress={currentAccountAddress} />
47+
</div>
48+
<div>
49+
<AccountBalance tokenSymbol={genName()} balance={genBalance} accountAddress={currentAccountAddress} />
50+
</div>
5151
</div>
52-
</div>
52+
: "" }
5353
</div>
5454
);
5555
}
@@ -65,14 +65,11 @@ export default withSubscription({
6565
},
6666

6767
createObservable: ({ dao, address }: IExternalProps) => {
68-
if (!dao) {
69-
return of(null);
70-
}
71-
const daoState = dao;
7268
const arc = getArc();
7369

7470
return combineLatest(
75-
address && daoState.dao.member(address).state( { subscribe: true }) || of(null),
71+
address,
72+
(address && dao && dao.dao.member(address).state( { subscribe: true })) || of(null),
7673
ethBalance(address).pipe(ethErrorHandler()),
7774
arc.GENToken().balanceOf(address).pipe(ethErrorHandler()),
7875
);

‎src/components/Account/AccountProfilePage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ class AccountProfilePage extends React.Component<IProps, IState> {
284284
}
285285
<div className={css.otherInfoContainer}>
286286
<div className={css.tokens}>
287-
{accountInfo
287+
{(accountInfo && dao)
288288
? <div><strong>Rep. Score</strong><br /><Reputation reputation={accountInfo.reputation} totalReputation={dao.reputationTotalSupply} daoName={dao.name} /> </div>
289289
: ""}
290290
<div><strong>{genName()}:</strong><br /><span>{formatTokens(genBalance)}</span></div>

‎src/components/Buidlhub/Registration.scss

+77-81
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,97 @@
11
.bhubRegContainer {
2+
width: 100% !important;
3+
display: flex;
4+
flex-direction: column;
5+
justify-content: flex-start;
6+
align-content: flex-start;
7+
align-items: flex-start;
8+
padding: 10px;
9+
10+
.bhubIcon {
211
width: 100% !important;
312
display: flex;
13+
text-align: left;
414
flex-direction: column;
515
justify-content: flex-start;
6-
align-content: flex-start;
716
align-items: flex-start;
8-
padding: 10px;
17+
padding: 0 !important;
18+
margin-left: -40px !important;
19+
}
920

21+
.inputWrapper {
22+
display: flex;
23+
flex-direction: row;
24+
justify-content: flex-start;
25+
align-items: flex-start;
1026

11-
.bhubIcon {
12-
width: 100% !important;
13-
display: flex;
14-
text-align: left;
15-
flex-direction: column;
16-
justify-content: flex-start;
17-
align-items: flex-start;
18-
padding: 0 !important;
19-
margin-left: -40px !important;
27+
.emailInput {
28+
border-radius: 5px;
29+
height: 30px !important;
30+
padding: 5px;
31+
border: 1px solid #aaa;
32+
margin-right: 5px !important;
2033
}
2134

22-
.inputWrapper {
23-
display: flex;
24-
flex-direction: row;
25-
justify-content: flex-start;
26-
align-items: flex-start;
27-
28-
.emailInput {
29-
border-radius: 5px;
30-
height: 30px !important;
31-
padding: 5px;
32-
border: 1px solid #aaa;
33-
margin-right: 5px !important;
34-
}
35-
36-
37-
.sendButtonWrapper {
38-
height: 30px;
39-
display: inline-flex;
40-
justify-content: center;
41-
align-items: center;
35+
.sendButtonWrapper {
36+
height: 30px;
37+
display: inline-flex;
38+
justify-content: center;
39+
align-items: center;
4240

43-
.sendButton {
44-
background-color: rgba(104, 155, 214, 1);
45-
border: 1px solid #333;
46-
border-radius: 5px;
47-
color: white;
41+
.sendButton {
42+
background-color: rgba(104, 155, 214, 1);
43+
border: 1px solid #333;
44+
border-radius: 5px;
45+
color: white;
4846

49-
&:hover {
50-
background-color: rgba(3, 118, 255, 1);
51-
cursor: pointer;
52-
}
53-
}
47+
&:hover {
48+
background-color: rgba(3, 118, 255, 1);
49+
cursor: pointer;
50+
}
51+
}
5452

55-
.sendButtonDisabled {
56-
background-color: #ccc;
57-
border: 1px solid #aaa;
58-
border-radius: 5px;
59-
color: #aaa;
60-
&:hover {
61-
cursor: default;
62-
}
63-
}
53+
.sendButtonDisabled {
54+
background-color: #ccc;
55+
border: 1px solid #aaa;
56+
border-radius: 5px;
57+
color: #aaa;
58+
&:hover {
59+
cursor: default;
6460
}
61+
}
6562
}
63+
}
6664

67-
.error {
68-
width: 100% !important;
69-
display: flex;
70-
flex-direction: row;
71-
justify-content: flex-start;
72-
align-items: flex-start;
73-
color: red;
74-
font-size: 1rem;
75-
}
65+
.error {
66+
width: 100% !important;
67+
display: flex;
68+
flex-direction: row;
69+
justify-content: flex-start;
70+
align-items: flex-start;
71+
color: red;
72+
font-size: 1rem;
73+
}
7674

77-
78-
.success {
79-
width: 100% !important;
80-
display: flex;
81-
flex-direction: row;
82-
justify-content: flex-start;
83-
align-items: flex-start;
84-
color: green;
85-
font-size: 1.3rem;
75+
.success {
76+
width: 100% !important;
77+
display: flex;
78+
flex-direction: row;
79+
justify-content: flex-start;
80+
align-items: flex-start;
81+
color: $accent-3;
82+
font-size: 1.3rem;
8683

87-
.message {
88-
color: #333;
89-
font-size: .9rem;
90-
font-weight: 100;
91-
padding-left: 20px;
92-
}
84+
.message {
85+
color: #333;
86+
font-size: 0.9rem;
87+
font-weight: 100;
88+
padding-left: 20px;
9389
}
90+
}
9491

95-
.description {
96-
97-
font-size: 1rem !important;
98-
font-weight: 100 !important;
99-
padding-bottom: 10px;
100-
}
101-
}
92+
.description {
93+
font-size: 1rem !important;
94+
font-weight: 100 !important;
95+
padding-bottom: 10px;
96+
}
97+
}

‎src/components/Dao/Dao.scss

-30
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,6 @@ button:hover {
103103
}
104104
}
105105

106-
.proposalHistoryTable {
107-
width: 100%;
108-
border-collapse: collapse;
109-
}
110-
111-
.proposalHistoryTableHeader {
112-
font-size: 12px;
113-
font-weight: bold;
114-
text-align: left;
115-
}
116-
117106
.noticeWrapper {
118107
width: 100%;
119108
position: fixed;
@@ -263,17 +252,6 @@ a {
263252
}
264253
}
265254

266-
.daoHistoryHeader {
267-
font-size: 28px;
268-
color: rgba(104, 155, 214, 1);
269-
border-bottom: 1px solid rgba(45, 109, 181, 0.2);
270-
padding-bottom: 5px;
271-
font-weight: bold;
272-
margin-bottom: 30px;
273-
background-color: rgba(229, 235, 242, 1);
274-
padding-top: 10px;
275-
}
276-
277255
@media only screen and (max-width: 425px) {
278256
.outer {
279257
display: block;
@@ -353,14 +331,6 @@ a {
353331
.membersContainer h2 {
354332
padding-left: 10px;
355333
}
356-
357-
.daoHistoryHeader {
358-
padding-left: 10px;
359-
}
360-
361-
.proposalHistoryTableHeader {
362-
display: none;
363-
}
364334
}
365335

366336
:global .infinite-scroll-component {

0 commit comments

Comments
 (0)