Skip to content

Commit

Permalink
Unwrap link
Browse files Browse the repository at this point in the history
  • Loading branch information
m-pilarczyk committed Nov 22, 2021
1 parent da58798 commit 98cb886
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

## [0.4.5] - 2021-11-22
### Added
- Unwrap link
### Removed
- New tab proxy option
### Fixed
Expand Down
12 changes: 6 additions & 6 deletions app/components/atoms/Box.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

.box hr {
background-color: var(--white);
border-color: var(--white);
}

.box.info {
Expand Down Expand Up @@ -42,7 +42,7 @@
}

.box.inverse hr {
background-color: var(--slate-dark);
border-color: var(--slate-dark);
}

.box.inverse > .icon {
Expand All @@ -55,7 +55,7 @@
}

.box.inverse.info hr {
background-color: var(--blue-dark);
border-color: var(--blue-dark);
}

.box.inverse.success {
Expand All @@ -64,7 +64,7 @@
}

.box.inverse.success hr {
background-color: var(--green-dark);
border-color: var(--green-dark);
}

.box.inverse.warning {
Expand All @@ -73,7 +73,7 @@
}

.box.inverse.warning hr {
background-color: var(--yellow-dark);
border-color: var(--yellow-dark);
}

.box.inverse.danger {
Expand All @@ -82,7 +82,7 @@
}

.box.inverse.danger hr {
background-color: var(--red-dark);
border-color: var(--red-dark);
}

.box .content {
Expand Down
1 change: 1 addition & 0 deletions app/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const config = {
privacyUrl: 'https://adshares.net/wallet.html#privacy',
attributionsUrl: 'https://adshares.net/wallet.html#attributions',
freeCoinsUrl: 'https://github.com/adshares/ads/wiki/How-to-join-the-Testnet#get-free-test-coins',
unwrapUrl: 'https://wallet.adshares.net/',
about: require('./about'),
terms: require('./terms'),
attributions: require('./attributions'),
Expand Down
2 changes: 1 addition & 1 deletion app/containers/Transactions/AuthenticateForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default class AuthenticateForm extends SignForm {
k => k.publicKey === account.publicKey
);
}
return { account, key, keyError: !key};
return { account, key, keyError: !key };
}

getCommand() {
Expand Down
17 changes: 16 additions & 1 deletion app/containers/Transactions/AvailableGatewaysPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Page from '../../components/Page/Page';
import Box from '../../components/atoms/Box';
import ButtonLink from '../../components/atoms/ButtonLink';
import PageComponent from '../../components/PageComponent';
import config from '../../config/config';

class AvailableGatewaysPage extends PageComponent {
static propTypes = {
Expand All @@ -30,7 +31,9 @@ class AvailableGatewaysPage extends PageComponent {
{gateways.map(gateway =>
<ButtonLink
key={gateway.code}
icon="left" layout="info" inverse
icon="left"
layout="info"
inverse
to={{
pathname: `/transactions/gateways/${gateway.code}`,
state: { referrer: this.props.history.location }
Expand All @@ -39,6 +42,18 @@ class AvailableGatewaysPage extends PageComponent {
<FontAwesomeIcon icon={faRandom} /> {gateway.name}
</ButtonLink>
)}
<hr className="dashed" />
<ButtonLink
className={style.unwrap}
icon="left"
layout="info"
external
target="_blank"
rel="noopener noreferrer"
href={config.unwrapUrl}
>
<FontAwesomeIcon icon={faRandom} /> Unwrap
</ButtonLink>
</div>
);
}
Expand Down
10 changes: 10 additions & 0 deletions app/containers/Transactions/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,13 @@
.availableLinks > *:nth-child(odd) {

}

.availableLinks hr {
margin-bottom: 18px;
border-color: var(--blue-dark);
border-style: dashed;
}

.unwrap svg {
transform: rotatey(180deg);
}
7 changes: 4 additions & 3 deletions chrome/extension/adswallet.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@ a:hover {
}

hr {
border: none;
border: 0;
border-top: 1px solid var(--gray-dark);
background: none;
height: 1px;
background-color: var(--gray-dark);
}

code {
overflow-wrap: anywhere;
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adshares/ads-browser-wallet",
"version": "0.4.4",
"version": "0.4.5",
"display-name": "ADS Wallet",
"description": "Secure identity vault for Adshares network.",
"private": true,
Expand Down

0 comments on commit 98cb886

Please sign in to comment.