Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add AlphaWallet as a supporting wallet for xDAI #186

Merged
merged 2 commits into from
Feb 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ The same address is used to send a coin from the Home network and receive a toke
- Wallet Resources
- [MetaMask](https://consensys.zendesk.com/hc/en-us/categories/360001045692-Using-MetaMask)
- [Nifty Wallet](https://poanet.zendesk.com/hc/en-us/articles/360008957634-Nifty-Wallet)

- [AlphaWallet (iOS and Android)](https://alphawallet.github.io/AlphaWallet-Download-Page/)
## Getting Started

The following is an example setup using the POA Sokol testnet as the Home network, and the Ethereum Kovan testnet as the Foreign network. The instructions for the Bridge UI are identical for an `ERC20-to-ERC20` configuration, but the smart contract deployment steps will vary.
Expand All @@ -75,7 +75,7 @@ The following is an example setup using the POA Sokol testnet as the Home networ
- [poa-bridge-contracts](https://github.com/poanetwork/poa-bridge-contracts)
- [token-bridge](https://github.com/poanetwork/token-bridge)
- [node.js](https://nodejs.org/en/download/)
- [Nifty Wallet](https://chrome.google.com/webstore/detail/nifty-wallet/jbdaocneiiinmjbjlgalhcelgbejmnid?hl=en) or [MetaMask](https://metamask.io/)
- [AlphaWallet](https://alphawallet.github.io/AlphaWallet-Download-Page/) or [Nifty Wallet](https://chrome.google.com/webstore/detail/nifty-wallet/jbdaocneiiinmjbjlgalhcelgbejmnid?hl=en) or [MetaMask](https://metamask.io/)

### Example Setup

Expand Down Expand Up @@ -182,7 +182,7 @@ REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL | An interval in milliseconds used t
REACT_APP_DESCRIPTION | The meta description for the deployed bridge page

* Run `npm run start`
* Make sure your web3 wallet (Nifty Wallet or MetaMask) is funded and connected to the POA Sokol Network (see step 2)
* Make sure your web3 wallet (Nifty Wallet, AlphaWallet or MetaMask) is funded and connected to the POA Sokol Network (see step 2)
* Specify an amount and click `Transfer` to complete a cross-chain transaction from Sokol to Kovan

## Testing
Expand Down
14 changes: 14 additions & 0 deletions src/assets/stylesheets/application/bridge.scss
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,20 @@
}
}

.noWallet-alphawallet {
width: 106px;
line-height: 36px;
text-align: center;
border-radius: 3px;
color: #ffffff;
background-color: #64a231;

@media screen and (max-width: $small-mobile-width) {
width: 100%;
margin: 10px 0;
}
}

.noWallet-cancel {
width: 72px;
height: 36px;
Expand Down
10 changes: 9 additions & 1 deletion src/components/NoWallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class NoWallet extends Component {
</div>
<div className="noWallet-alert-container">
<h2 className="noWallet-title">Wallet not found</h2>
<p className="noWallet-description">A wallet is not installed. Before continue, please install one (Metamask
<p className="noWallet-description">A wallet is not installed. Before continue, please install one (AlphaWallet, Metamask
or Nifty Wallet) and return to this page to continue using the application.</p>
<p className="noWallet-description">For further information on how to install any of both wallets, please
click the buttons below.</p>
Expand All @@ -49,6 +49,14 @@ export class NoWallet extends Component {
>
Nifty Wallet
</a>
<a
className="noWallet-alphawallet"
href="https://alphawallet.github.io/AlphaWallet-Download-Page/"
rel="noopener noreferrer"
target="_blank"
>
AlphaWallet
</a>
<button className="noWallet-cancel" onClick={this.handleCancel}>Cancel</button>
</div>
</div>
Expand Down