Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

Fixes #1964 Adding notice to wallet about Stacks Wallet #1965

Merged
hstove merged 3 commits into from
Nov 13, 2019
Merged

Fixes #1964 Adding notice to wallet about Stacks Wallet #1965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8abbaf9
Fixes #1964 Adding notice to wallet about Stacks Wallet
Oct 30, 2019
ef294d8
fixing lint error
Oct 30, 2019
b318b24
Updating the message in the note
Nov 5, 2019
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
37 changes: 21 additions & 16 deletions app/js/wallet/WalletApp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,28 @@ class WalletApp extends Component {
const activeTabUrl = `/wallet/${childPath}`

return (
<div>
<Navbar activeTab="wallet" />
<SecondaryNavBar
leftButtonTitle="Receive"
leftButtonLink="/wallet/receive"
isLeftActive={(activeTabUrl === '/wallet/receive')}
rightButtonTitle="Send"
rightButtonLink="/wallet/send"
isRightActive={(activeTabUrl === '/wallet/send')}
activeClass="active-wallet"
customButtonClass="btn-wallet"
/>
<div className="container-fluid col-centered form-container-secondary">
<div>
{this.props.children}
<div className="container-fluid">
<div>
<Navbar activeTab="wallet" />
<div className="container-fluid col-centered form-container-secondary">
<strong>NOTE:</strong> You cannot use this wallet to send and receive Stacks (STX) tokens. Also, you cannot use the Bitcoin (BTC) address on this page to fund STX transactions. This wallet and its address <strong>only</strong> support the purchase of Blockstack identities(IDs). <strong>To create or fund STX transactions, use the Stacks Wallet software.</strong> See <a href="https://docs.blockstack.org/org/wallet-install.html" target="_blank">the Stacks Wallet software documentation</a> for more information.
Copy link
Copy Markdown

@markmhendrickson markmhendrickson Nov 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR has been merged but I spot the need for a space here before "(IDs)" so @moxiegirl or @hstove you may want to create a small new PR to correct.

</div>
</div>
<SecondaryNavBar
leftButtonTitle="Receive"
leftButtonLink="/wallet/receive"
isLeftActive={(activeTabUrl === '/wallet/receive')}
rightButtonTitle="Send"
rightButtonLink="/wallet/send"
isRightActive={(activeTabUrl === '/wallet/send')}
activeClass="active-wallet"
customButtonClass="btn-wallet"
/>
<div className="container-fluid col-centered form-container-secondary">
<div>
{this.props.children}
</div>
</div>
</div>
</div>
)
}
Expand Down
Loading