Skip to content
This repository has been archived by the owner on Oct 8, 2019. It is now read-only.

Commit

Permalink
feat(BCH): warning when sending from bch to external
Browse files Browse the repository at this point in the history
  • Loading branch information
plondon committed Dec 12, 2017
1 parent 7719cfc commit 78b3253
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions app/partials/send/send-confirm.pug
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
fiat.f-20(btc="$ctrl.getTransactionTotal(true)" ng-if="$ctrl.asset === 'btc'")
fiat.f-20(eth="$ctrl.getTransactionTotal(true)" ng-if="$ctrl.asset === 'eth'")
fiat.f-20(bch="$ctrl.getTransactionTotal(true)" ng-if="$ctrl.asset === 'bch'")
div.well.em-400.type-h5.hidden-xs(translate="BITCOIN_CASH.VERIFY_ADDRESS" ng-if="$ctrl.asset === 'bch' && $ctrl.tx.destination.type === 'External'")
.mt-30
button.full.button-primary.upper(
ladda-translate="{{$ctrl.getButtonContent()}}"
Expand Down
5 changes: 5 additions & 0 deletions assets/css/modules/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ table.accounts-container {
border-left: 5px solid $blue;
}

div.well {
margin-bottom: 0px;
font-size: 14px;
}

.setting-result {
@extend .prn;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/components/send-confirm.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ function SendConfirmController (Wallet, currency, $rootScope) {
this.btcCurr = currency.bitCurrencies[0];

this.getButtonContent = () => {
if (this.asset === 'bch') return 'SEND_BITCOIN_CASH';
if (this.asset === 'eth') return 'SEND_ETHER';
if (this.asset === 'btc') return this.tx.destination.type !== 'External' ? 'TRANSFER_BITCOIN' : 'SEND_BITCOIN';
if (this.asset === 'bch') return this.tx.destination.type !== 'External' ? 'TRANSFER_BITCOIN_CASH' : 'SEND_BITCOIN_CASH';
};

this.size = $rootScope.size;
Expand Down
2 changes: 2 additions & 0 deletions locales/en-human.json
Original file line number Diff line number Diff line change
Expand Up @@ -1984,6 +1984,7 @@
"ALL_WALLETS": "All Bitcoin Cash Wallets",
"GET_STARTED": "Get Started With Bitcoin Cash",
"WELCOME_TO": "Welcome to Bitcoin Cash",
"VERIFY_ADDRESS": "Are you sure this is a Bitcoin Cash address? Sending funds to a bitcoin address by accident will result in loss of funds.",
"WHAT_IS_BCASH": {
"HEADER": "What is Bitcoin Cash?",
"BODY": "Bitcoin Cash is a form of peer-to-peer electronic cash that was created after a fork of the Bitcoin block chain in August 2017. Bitcoin Cash has since grown to be one of the top cryptocurrencies, along with bitcoin and ether."
Expand All @@ -1999,6 +2000,7 @@
"EXCHANGE_STATUS": "Exchange Status",
"SEND_ETHER": "Send Ether",
"SEND_BITCOIN_CASH": "Send Bitcoin Cash",
"TRANSFER_BITCOIN_CASH": "Transfer Bitcoin Cash",
"REQUEST_BITCOIN": "Request Bitcoin",
"REQUEST_ETHER": "Request Ether",
"REQUEST_BITCOIN_CASH": "Request Bitcoin Cash",
Expand Down

0 comments on commit 78b3253

Please sign in to comment.