Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Backport #6719 & #6725 (#6726)
Browse files Browse the repository at this point in the history
* Check vouch status on appId in addition to contentHash (#6719)

* Check vouch status on appId in addition to contentHash

* Simplify var expansion

* Merge #6725

* Add updated MethodDecoding from master
  • Loading branch information
jacogr authored and arkpar committed Oct 12, 2017
1 parent 822fa82 commit 8157a83
Show file tree
Hide file tree
Showing 20 changed files with 793 additions and 357 deletions.
12 changes: 6 additions & 6 deletions js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/src/contracts/badgereg.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default class BadgeReg {
]);
})
.then(([ title, icon ]) => {
title = bytesToHex(title);
title = bytesToHex(title).replace(/(00)+$/, '');
title = title === ZERO32 ? null : hexToAscii(title);

if (bytesToHex(icon) === ZERO32) {
Expand Down
1 change: 1 addition & 0 deletions js/src/dapps/tokenreg/Application/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
left: 0;
opacity: 1;
padding: 1.5em;
cursor: pointer;
position: fixed;
right: 50%;
z-index: 100;
Expand Down
21 changes: 18 additions & 3 deletions js/src/dapps/tokenreg/Application/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ export default class Application extends Component {
contract: PropTypes.object
};

state = {
hideWarning: false
};

render () {
const { isLoading, contract } = this.props;
const { hideWarning } = this.state;

if (isLoading) {
return (
Expand All @@ -62,9 +67,15 @@ export default class Application extends Component {
<Actions />

<Tokens />
<div className={ styles.warning }>
WARNING: The token registry is experimental. Please ensure that you understand the steps, risks, benefits & consequences of registering a token before doing so. A non-refundable fee of { api.util.fromWei(contract.fee).toFormat(3) }<small>ETH</small> is required for all registrations.
</div>
{
hideWarning
? null
: (
<div className={ styles.warning } onClick={ this.handleHideWarning }>
WARNING: The token registry is experimental. Please ensure that you understand the steps, risks, benefits & consequences of registering a token before doing so. A non-refundable fee of { api.util.fromWei(contract.fee).toFormat(3) }<small>ETH</small> is required for all registrations.
</div>
)
}
</div>
);
}
Expand All @@ -74,4 +85,8 @@ export default class Application extends Component {
muiTheme
};
}

handleHideWarning = () => {
this.setState({ hideWarning: true });
}
}
8 changes: 0 additions & 8 deletions js/src/redux/providers/certifications/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

export const fetchCertifiers = () => ({
type: 'fetchCertifiers'
});

export const fetchCertifications = (address) => ({
type: 'fetchCertifications', address
});

export const addCertification = (address, id, name, title, icon) => ({
type: 'addCertification', address, id, name, title, icon
});
Expand Down
Loading

0 comments on commit 8157a83

Please sign in to comment.