From b060c09644e87753bf17e179ac7b185873669a6f Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 09:22:07 +0100 Subject: [PATCH 01/22] fix(FAQ): copy --- .../src/components/Faq/FaqContent/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js index 697f72928c4..7b28004ba6e 100644 --- a/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js @@ -39,7 +39,7 @@ const FaqContent = [

- + }, { question: , @@ -50,16 +50,16 @@ const FaqContent = [

- + }, { - question: , + question: , answer: - +

From e0879f3f03b218dbb05c77e2885f90f0fa3e8498 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 09:26:14 +0100 Subject: [PATCH 02/22] fix(Copy): email shouldn't be bold --- .../src/scenes/SecurityCenter/EmailAddress/template.success.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/EmailAddress/template.success.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/EmailAddress/template.success.js index d9415915991..9cc1bc2ebf1 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/EmailAddress/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/EmailAddress/template.success.js @@ -81,7 +81,7 @@ const EmailAddress = (props) => { - {email} + {email} From 5f15cb32c1bb92f9607a5c242ab1d6423115d603 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 10:49:21 +0100 Subject: [PATCH 03/22] fix(Console): remove console warnings --- .../src/Dropdowns/ComponentDropdown/template.js | 5 ++++- .../src/Dropdowns/SimpleDropdown/index.js | 2 +- .../src/Dropdowns/SimpleDropdown/template.js | 5 ++++- .../src/components/Display/CoinDisplay/template.success.js | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/blockchain-info-components/src/Dropdowns/ComponentDropdown/template.js b/packages/blockchain-info-components/src/Dropdowns/ComponentDropdown/template.js index 3164a0deb26..89685b40240 100644 --- a/packages/blockchain-info-components/src/Dropdowns/ComponentDropdown/template.js +++ b/packages/blockchain-info-components/src/Dropdowns/ComponentDropdown/template.js @@ -96,7 +96,10 @@ Dropdown.defaultProps = { } Dropdown.propTypes = { - selectedValue: PropTypes.number, + selectedValue: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number + ]), callback: PropTypes.func.isRequired, toggled: PropTypes.bool, color: PropTypes.oneOf(keysIn(Palette())), diff --git a/packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/index.js b/packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/index.js index 6a7c55f3a93..fb7bbe449df 100644 --- a/packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/index.js +++ b/packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/index.js @@ -46,7 +46,7 @@ class SimpleDropdown extends React.PureComponent { SimpleDropdown.defaultProps = { color: 'brand-secondary', opened: false, - selectedValue: 0, + // selectedValue: 0, uppercase: true, down: false } diff --git a/packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/template.js b/packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/template.js index cd1bed8176e..59ccbe34b61 100644 --- a/packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/template.js +++ b/packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/template.js @@ -97,7 +97,10 @@ Dropdown.defaultProps = { } Dropdown.propTypes = { - selectedValue: PropTypes.number, + selectedValue: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number + ]), items: PropTypes.arrayOf(PropTypes.shape({ text: PropTypes.string.isRequired, value: PropTypes.string.isRequired diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Display/CoinDisplay/template.success.js b/packages/blockchain-wallet-v4-frontend/src/components/Display/CoinDisplay/template.success.js index 86fd26b78cc..c64e4f972f8 100644 --- a/packages/blockchain-wallet-v4-frontend/src/components/Display/CoinDisplay/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/components/Display/CoinDisplay/template.success.js @@ -45,7 +45,7 @@ CoinDisplay.defaultProps = { weight: 300, color: 'gray-5', cursor: 'auto', - mobileSize: false + mobileSize: '' } export default CoinDisplay From a71bb1832b439ec1c3e6009c4227bcaa5e4ec5d5 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 10:49:42 +0100 Subject: [PATCH 04/22] fix(Copy): address and xpub copy --- .../src/assets/locales/en.json | 18 +++++++++--------- .../src/modals/MobileNumberVerify/template.js | 6 +++--- .../src/modals/ShowXPub/template.js | 2 +- .../Addresses/Bch/Wallets/template.success.js | 2 +- .../Addresses/Btc/Wallets/template.success.js | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json index 75198e597e9..accfff2975d 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json @@ -229,7 +229,7 @@ "modals.mobilenumberverify.explain": "We have sent an SMS message with a verification code to {number}.", "modals.mobilenumberverify.explain2": "Enter code:", "modals.mobilenumberverify.resend": "Resend", - "modals.mobilenumberverify.get_code": " or ", + "modals.mobilenumberverify.get_code": "or", "modals.mobilenumberverify.change": "change mobile number", "modals.mobilenumberverify.cancel": "Cancel", "modals.mobilenumberverify.verify": "Verify", @@ -266,14 +266,14 @@ "modals.requestbch.title": "Request Bitcoin Cash", "modals.sendbch.coin": "Currency:", "modals.requestbitcoin.firststep.to": "Receive To:", - "modals.requestbch.share": "Copy & Share Address: ", + "modals.requestbch.share": "Copy & Share Address:", "modals.requestbch.share_tooltip": "Share this address with others, and they can send you Bitcoin Cash directly to your wallet. Your address changes with every payment.", "modals.requestbch.or": "Or", "modals.requestbch.scan": "Scan QR Code:", "modals.requestbch.scan_tooltip": "Ask the sender to scan this QR code with their Bitcoin cash wallet", "modals.requestbch.done": "Done", "modals.sendbitcoin.firststep.coin": "Currency:", - "modals.requestbitcoin.firststep.share": "Copy & Share Address: ", + "modals.requestbitcoin.firststep.share": "Copy & Share Address:", "modals.requestbitcoin.firststep.share_tooltip": "Share this address with others, and they can send you BTC directly to your wallet. Your address changes with every payment. You can also create a request by attaching an amount below.", "modals.requestbitcoin.firststep.qrcode": "QR Code", "modals.requestbitcoin.firststep.or": "Or", @@ -303,7 +303,7 @@ "modals.sendBch.firststep.coin": "Currency:", "modals.sendBch.firststep.from": "From:", "modals.sendBch.firststep.to": "To:", - "modals.sendBch.firststep.description": "Description: ", + "modals.sendBch.firststep.description": "Description:", "modals.sendBch.firststep.share_tooltip": "Add a note to remind yourself what this transaction relates to. This note will be private and only seen by you.", "modals.sendBch.firststep.fee": "Transaction fee:", "modals.sendBch.firststep.continue": "Continue", @@ -328,7 +328,7 @@ "modals.sendbtc.firststep.from": "From:", "modals.sendbtc.firststep.to": "To:", "modals.sendbtc.firststep.amount": "Enter Amount:", - "modals.sendbtc.firststep.description": "Description: ", + "modals.sendbtc.firststep.description": "Description:", "modals.sendbtc.firststep.share_tooltip": "Add a note to remind yourself what this transaction relates to. This note will be private and only seen by you.", "modals.sendbtc.firststep.fee": "Transaction fee:", "modals.sendbtc.firststep.cancel": "Cancel", @@ -354,7 +354,7 @@ "modals.sendether.firststep.coin": "Currency:", "modals.sendether.firststep.to": "To:", "modals.sendether.firststep.amount": "Enter amount:", - "modals.sendether.firststep.description": "Description: ", + "modals.sendether.firststep.description": "Description:", "modals.sendether.firststep.share_tooltip": "Add a note to remind yourself what this transaction relates to. This note will be private and only seen by you.", "modals.sendether.firststep.fee": "Transaction Fee :", "modals.sendether.firststep.continue": "Continue", @@ -451,7 +451,7 @@ "modals.show_used_addresses.cancel": "Cancel", "modals.show_used_addresses.ok": "OK", "modals.xpub.warning": "Warning", - "modals.xpub.warning_message": "You should only give this Extended Public Key (xPub) to those you trust. With this information, they may be able to keep track of your payments, and may be able to disrupt your access to your wallet.", + "modals.xpub.warning_message": "Don't share your Extended Public Key (xPub) with an untrusted source. Anyone with access to this can keep track of your payments and may be able to disrupt access to your wallet.", "modals.xpub.title": "Extended Public Key", "modals.xpub.close": "Close", "modals.xpub.continue": "Continue", @@ -896,7 +896,7 @@ "scenes.settings.addresses.bch.default_label": "Default", "scenes.settings.bch.addresses.archived_label": "Archived", "scenes.settings.addresses.bch_wallets": "Bitcoin Cash Wallets", - "scenes.settings.addresses.bch_wallets_description": "Wallets are a way of organizing your funds. Common ways to organize your funds include dividing them up into categories like spending, savings, or business related expenses. Your wallet automatically manages your bitcoin cash addresses for you by generating a new one each time you need one to receive a payment. You can click on Manage to the right of a wallet to see all of the individual addresses that have been generated for that specific wallet.", + "scenes.settings.addresses.bch_wallets_description": "Wallets allow you to organize your funds into categories, like spending or savings. To see all of the individual addresses that have been generated for each wallet, click on 'Manage'.", "scenes.settings.addresses.bch.wallet_name": "Wallet Name", "scenes.settings.addresses.bch.wallet_balance": "Balance", "scenes.settings.imported_addresses.bch.wallet_actions": "Actions", @@ -929,7 +929,7 @@ "scenes.settings.addresses.archived_label": "Archived", "scenes.settings.addresses.unarchive": "Unarchive", "scenes.settings.addresses.bitcoin_wallets": "Bitcoin Wallets", - "scenes.settings.addresses.bitcoin_wallets_description": "Wallets are a way of organizing your funds. Common ways to organize your funds include dividing them up into categories like spending, savings, or business related expenses. Your wallet automatically manages your bitcoin addresses for you by generating a new one each time you need one to receive a payment. You can click on Manage to the right of a wallet to see all of the individual addresses that have been generated for that specific wallet.", + "scenes.settings.addresses.bitcoin_wallets_description": "Wallets allow you to organize your funds into categories, like spending or savings. To see all of the individual addresses that have been generated for each wallet, click on 'Manage'.", "scenes.settings.addresses.wallet_name": "Wallet Name", "scenes.settings.addresses.wallet_description": "Balance", "scenes.settings.addresses.wallet_actions": "Actions", diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js index 522caca94cf..f73a1d42c95 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js @@ -42,13 +42,13 @@ const MobileNumberVerify = (props) => { - + - + - + diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ShowXPub/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/ShowXPub/template.js index 47419405bd2..9005251d839 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/ShowXPub/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/ShowXPub/template.js @@ -23,7 +23,7 @@ const FirstStep = () => ( - + ) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bch/Wallets/template.success.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bch/Wallets/template.success.js index 1950aa340c6..7d137268ccb 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bch/Wallets/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bch/Wallets/template.success.js @@ -84,7 +84,7 @@ const Success = (props) => { - + diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Btc/Wallets/template.success.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Btc/Wallets/template.success.js index 39e7dae8562..1596f69af35 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Btc/Wallets/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Btc/Wallets/template.success.js @@ -58,7 +58,7 @@ const Success = ({ wallets, handleClick, onUnarchive, search }) => { - +
From f23df207ce72f805014ec0478304d4ae76e3fbb9 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 11:11:18 +0100 Subject: [PATCH 05/22] fix(Copy): exchange and imported address copy --- .../blockchain-wallet-v4-frontend/src/assets/locales/en.json | 2 +- .../ImportBtcAddress/ImportExternalBtcAddress/index.js | 5 +---- .../ImportBtcAddress/ImportInternalBtcAddress/index.js | 3 --- .../src/scenes/Exchange/Info/index.js | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json index accfff2975d..5a1cfd06d3b 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json @@ -562,7 +562,7 @@ "selectpartner.selectcountry": "Select your country:", "selectpartner.getstarted": "get started", "scenes.exchange.simple": "Need help?", - "scenes.exchange.summary": "You can now exchange your bitcoin for ether and vice versa directly from your Blockchain wallet.", + "scenes.exchange.summary": "You can exchange between bitcoin, ether, and bitcoin cash directly from your Blockchain wallet.", "scenes.exchange.summary2": "In a few simple steps, your exchange will be in progress.", "scenes.exchange.summary3": "Note: exchanges usually take between twenty minutes and two hours.", "scenes.exchange.firststep.maximumamountlink.maximum": "maximum", diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportExternalBtcAddress/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportExternalBtcAddress/index.js index f0b6dfc1da2..935956d6982 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportExternalBtcAddress/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportExternalBtcAddress/index.js @@ -16,10 +16,7 @@ const Label = styled.label` class ImportExternalBitcoinAddress extends React.PureComponent { render () { return ( -
- - - +
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportInternalBtcAddress/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportInternalBtcAddress/index.js index 549c1e0c15c..f3f81492140 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportInternalBtcAddress/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportInternalBtcAddress/index.js @@ -18,9 +18,6 @@ class ImportInternalBitcoinAddress extends React.PureComponent { - - - ) } diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Exchange/Info/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Exchange/Info/index.js index 4c3db103cf9..c2f0569dade 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Exchange/Info/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Exchange/Info/index.js @@ -21,7 +21,7 @@ export default () => ( - + From 693404d3ecbc04113d4e57a4cbd3cc2e706d6752 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 11:32:16 +0100 Subject: [PATCH 06/22] fix(Lint): error --- .../src/components/Faq/FaqContent/index.js | 15 ++++++--------- .../ImportExternalBtcAddress/index.js | 2 +- .../ImportInternalBtcAddress/index.js | 4 ---- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js index 7b28004ba6e..24b6e8d8f00 100644 --- a/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js @@ -24,11 +24,8 @@ const FaqContent = [ question: , answer: }, { - question: , - answer: General. Addresses are what you share with others when you want to receive funds. To find your bitcoin, ether, or bitcoin cash address click on ‘Request’.'} /> - }, { - question: , - answer: + question: , + answer: }, { question: , answer: @@ -39,7 +36,7 @@ const FaqContent = [

- + }, { question: , @@ -50,16 +47,16 @@ const FaqContent = [

- + }, { - question: , + question: , answer: - +

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportExternalBtcAddress/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportExternalBtcAddress/index.js index 935956d6982..84a013cff1c 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportExternalBtcAddress/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportExternalBtcAddress/index.js @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl' import { SelectBoxBitcoinAddresses, FormGroup, FormItem, TextBox } from 'components/Form' import { optional, validBitcoinAddress, validBitcoinPrivateKey } from 'services/FormHelper' import { spacing } from 'services/StyleService' -import { Banner, Text } from 'blockchain-info-components' +import { Banner } from 'blockchain-info-components' const Label = styled.label` display: block; diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportInternalBtcAddress/index.js b/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportInternalBtcAddress/index.js index f3f81492140..c1fb0fbac02 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportInternalBtcAddress/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/ImportBtcAddress/ImportInternalBtcAddress/index.js @@ -6,10 +6,6 @@ import { Banner } from 'blockchain-info-components' const Wrapper = styled.div` margin-top: 15px; ` -const Info = styled.div` - margin-top: 15px; - font-size: 12px; -` class ImportInternalBitcoinAddress extends React.PureComponent { render () { From a07520105d5bdf8535fc066f2f2fc63c3e80a05b Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 12:55:09 +0100 Subject: [PATCH 07/22] fix(PriceChart): snapshot --- .../Home/PriceChart/__snapshots__/index.spec.js.snap | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Home/PriceChart/__snapshots__/index.spec.js.snap b/packages/blockchain-wallet-v4-frontend/src/scenes/Home/PriceChart/__snapshots__/index.spec.js.snap index 1776a2e1d09..9f528a13f13 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Home/PriceChart/__snapshots__/index.spec.js.snap +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Home/PriceChart/__snapshots__/index.spec.js.snap @@ -2,21 +2,19 @@ exports[`PriceChart component renders correctly 1`] = ` - - + - + - + From 7ca8318837a546d9b73dae4ab20aa2cd879d0c15 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 14:02:53 +0100 Subject: [PATCH 08/22] fix(Text) snapshot test --- .../src/Text/__snapshots__/TextGroup.spec.js.snap | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/blockchain-info-components/src/Text/__snapshots__/TextGroup.spec.js.snap b/packages/blockchain-info-components/src/Text/__snapshots__/TextGroup.spec.js.snap index bd31017b467..1393a16841f 100644 --- a/packages/blockchain-info-components/src/Text/__snapshots__/TextGroup.spec.js.snap +++ b/packages/blockchain-info-components/src/Text/__snapshots__/TextGroup.spec.js.snap @@ -1,10 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`TextGroup component default renders correctly 1`] = ` -.c0 { - text-align: left; -} - .c0 > * { white-space: nowrap; } From 0490b052ab37b56eca3d68fd64dadca5771b4513 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 15:48:33 +0100 Subject: [PATCH 09/22] fix(TxFeed): welcome modals for btc and bch --- .../src/Images/Images.js | 4 + .../src/Images/img/half-bitcoin.svg | 26 ++++ .../src/Images/img/half-bitcoincash.svg | 18 +++ .../src/assets/locales/en.json | 2 +- .../src/data/preferences/reducers.js | 10 ++ .../src/data/preferences/selectors.js | 4 + .../Content/Empty/BitcoinCashWelcome/index.js | 32 +++++ .../Empty/BitcoinCashWelcome/template.js | 118 ++++++++++++++++++ .../Bch/Content/Empty/template.js | 2 + .../Content/Empty/BitcoinWelcome/index.js | 32 +++++ .../Content/Empty/BitcoinWelcome/template.js | 115 +++++++++++++++++ .../Bitcoin/Content/Empty/template.js | 2 + .../Content/Empty/EtherWelcome/template.js | 4 +- 13 files changed, 366 insertions(+), 3 deletions(-) create mode 100644 packages/blockchain-info-components/src/Images/img/half-bitcoin.svg create mode 100644 packages/blockchain-info-components/src/Images/img/half-bitcoincash.svg create mode 100644 packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/index.js create mode 100644 packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js create mode 100644 packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/index.js create mode 100644 packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js diff --git a/packages/blockchain-info-components/src/Images/Images.js b/packages/blockchain-info-components/src/Images/Images.js index 30d38ba451f..aed3fc56b61 100644 --- a/packages/blockchain-info-components/src/Images/Images.js +++ b/packages/blockchain-info-components/src/Images/Images.js @@ -15,6 +15,8 @@ import chartPlaceholder from './img/chart-placeholder.png' import checkHelper from './img/check-helper.svg' import googleAuthenticator from './img/google-authenticator.png' import googlePlayBadge from './img/google-play-badge.png' +import halfBitcoin from './img/half-bitcoin.svg' +import halfBitcoincash from './img/half-bitcoincash.svg' import halfEther from './img/half-ether.svg' import landingPageBannerOverlay from './img/landing-page-banner-overlay.jpg' import landingPageBannerSmOverlay from './img/landing-page-banner-sm-overlay.jpg' @@ -49,6 +51,8 @@ export default { 'check-helper': checkHelper, 'google-authenticator': googleAuthenticator, 'google-play-badge': googlePlayBadge, + 'half-bitcoin': halfBitcoin, + 'half-bitcoincash': halfBitcoincash, 'half-ether': halfEther, 'landing-page-banner-overlay': landingPageBannerOverlay, 'landing-page-banner-sm-overlay': landingPageBannerSmOverlay, diff --git a/packages/blockchain-info-components/src/Images/img/half-bitcoin.svg b/packages/blockchain-info-components/src/Images/img/half-bitcoin.svg new file mode 100644 index 00000000000..945421d031f --- /dev/null +++ b/packages/blockchain-info-components/src/Images/img/half-bitcoin.svg @@ -0,0 +1,26 @@ + + + + bitcoin + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/blockchain-info-components/src/Images/img/half-bitcoincash.svg b/packages/blockchain-info-components/src/Images/img/half-bitcoincash.svg new file mode 100644 index 00000000000..ed8e394993b --- /dev/null +++ b/packages/blockchain-info-components/src/Images/img/half-bitcoincash.svg @@ -0,0 +1,18 @@ + + + + Artboard + Created with Sketch. + + + + + + + + + + + + + diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json index 5a1cfd06d3b..326f48ee437 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json @@ -1001,7 +1001,7 @@ "scenes.transactions.bitcoin.content.empty.request": "Request", "scenes.transaction.ether.content.empty.etherwelcome.getstarted": "Get started with ether", "scenes.transaction.ether.content.empty.etherwelcome.welcome": "Welcome to Ether", - "scenes.transaction.ether.content.empty.etherwelcome.learnmore": "Learn More.", + "scenes.transaction.ether.content.empty.etherwelcome.learnmore": "Learn Mores", "scenes.transaction.ether.content.empty.etherwelcome.what": "What is ether?", "scenes.transaction.ether.content.empty.etherwelcome.currency": "Ether is a digital currency.", "scenes.transaction.ether.content.empty.etherwelcome.transact": "Like Bitcoin, it enables people around the world to transact, save, and hedge their way to a better financial future.", diff --git a/packages/blockchain-wallet-v4-frontend/src/data/preferences/reducers.js b/packages/blockchain-wallet-v4-frontend/src/data/preferences/reducers.js index b747173ffc6..f824558c75f 100644 --- a/packages/blockchain-wallet-v4-frontend/src/data/preferences/reducers.js +++ b/packages/blockchain-wallet-v4-frontend/src/data/preferences/reducers.js @@ -10,6 +10,8 @@ const INITIAL_STATE = { showBuyAlert: true, showBuyBitcoinReminder: { index: 0, when: new Date().getTime() }, showEtherWelcome: true, + showBitcoinWelcome: true, + showBitcoinCashWelcome: true, showLogoutSurvey: true } @@ -35,6 +37,14 @@ const preferences = (state = INITIAL_STATE, action) => { const { displayed } = payload return assoc('showEtherWelcome', displayed, state) } + case AT.SET_BITCOIN_WELCOME: { + const { displayed } = payload + return assoc('showBitcoinWelcome', displayed, state) + } + case AT.SET_BITCOIN_CASH_WELCOME: { + const { displayed } = payload + return assoc('showBitcoinCashWelcome', displayed, state) + } default: return state } diff --git a/packages/blockchain-wallet-v4-frontend/src/data/preferences/selectors.js b/packages/blockchain-wallet-v4-frontend/src/data/preferences/selectors.js index efbf1369b26..d1f46d37e20 100644 --- a/packages/blockchain-wallet-v4-frontend/src/data/preferences/selectors.js +++ b/packages/blockchain-wallet-v4-frontend/src/data/preferences/selectors.js @@ -9,3 +9,7 @@ export const getTheme = path(['preferences', 'theme']) export const getCoinDisplayed = path(['preferences', 'coinDisplayed']) export const getShowEtherWelcome = path(['preferences', 'showEtherWelcome']) + +export const getShowBitcoinWelcome = path(['preferences', 'showBitcoinWelcome']) + +export const getShowBitcoinCashWelcome = path(['preferences', 'showBitcoinCashWelcome']) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/index.js new file mode 100644 index 00000000000..4d2383a4ba5 --- /dev/null +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/index.js @@ -0,0 +1,32 @@ +import React from 'react' +import { connect } from 'react-redux' +import { bindActionCreators } from 'redux' + +import { actions, selectors } from 'data' +import BitcoinCashWelcome from './template.js' + +class BitcoinCashWelcomeContainer extends React.PureComponent { + constructor (props) { + super(props) + this.handleClick = this.handleClick.bind(this) + } + + handleClick () { + this.props.preferencesActions.setBitcoinCashWelcome(false) + } + + render () { + const { showBitcoinCashWelcome } = this.props + return + } +} + +const mapStateToProps = state => ({ + showBitcoinCashWelcome: selectors.preferences.getShowBitcoinCashWelcome(state) +}) + +const mapDispatchToProps = dispatch => ({ + preferencesActions: bindActionCreators(actions.preferences, dispatch) +}) + +export default connect(mapStateToProps, mapDispatchToProps)(BitcoinCashWelcomeContainer) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js new file mode 100644 index 00000000000..7a51ab5aaeb --- /dev/null +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js @@ -0,0 +1,118 @@ +import React from 'react' +import PropTypes from 'prop-types' +import styled from 'styled-components' +import { FormattedMessage } from 'react-intl' +import { LinkContainer } from 'react-router-bootstrap' + +import { Button, Icon, Image, Link, Separator, Text, TextGroup } from 'blockchain-info-components' + +const Wrapper = styled.div` + position: relative; + display: ${props => props.displayed ? 'flex' : 'none'}; + flex-direction: row; + justify-content: space-between; + align-items: flex-start; + width: 100%; + background-color: ${props => props.theme['brand-quaternary']}; +` +const BitcoinCashImage = styled(Image)` + display: none; + height: 230px; + opacity: 0.3; + @media(min-width: 1200px) { display: block; } +` +const Container = styled.div` + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + width: 100%; + margin: 20px 30px 0 30px; +` +const Row = styled.div` + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + width: 100%; + box-sizing: border-box; + @media(min-width: 1200px) { + flex-direction: row; + } +` +const Cell = styled.div` + width: 100%; + padding: 15px; + box-sizing: border-box; + @media(min-width: 768px) { ${props => props.small ? '30%' : '35%'}; } +` +const CloseArrow = styled(Icon)` + height: 30px; + width: 30px; + margin-top: 20px; +` +const BitcoinCashWelcome = props => { + const { displayed, handleClick } = props + + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) +} + +BitcoinCashWelcome.propTypes = { + displayed: PropTypes.bool.isRequired, + handleClick: PropTypes.func.isRequired +} + +export default BitcoinCashWelcome diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/template.js index 16aebb26ff3..28da9755c85 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/template.js @@ -3,6 +3,7 @@ import PropTypes from 'prop-types' import styled from 'styled-components' import { FormattedMessage } from 'react-intl' import { Icon, IconButton, Separator, Text } from 'blockchain-info-components' +import BitcoinCashWelcome from './BitcoinCashWelcome' const Wrapper = styled.div` display: flex; @@ -35,6 +36,7 @@ const Empty = props => { return ( + diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/index.js new file mode 100644 index 00000000000..7ffac14f2b9 --- /dev/null +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/index.js @@ -0,0 +1,32 @@ +import React from 'react' +import { connect } from 'react-redux' +import { bindActionCreators } from 'redux' + +import { actions, selectors } from 'data' +import BitcoinWelcome from './template.js' + +class BitcoinWelcomeContainer extends React.PureComponent { + constructor (props) { + super(props) + this.handleClick = this.handleClick.bind(this) + } + + handleClick () { + this.props.preferencesActions.setBitcoinWelcome(false) + } + + render () { + const { showBitcoinWelcome } = this.props + return + } +} + +const mapStateToProps = state => ({ + showBitcoinWelcome: selectors.preferences.getShowBitcoinWelcome(state) +}) + +const mapDispatchToProps = dispatch => ({ + preferencesActions: bindActionCreators(actions.preferences, dispatch) +}) + +export default connect(mapStateToProps, mapDispatchToProps)(BitcoinWelcomeContainer) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js new file mode 100644 index 00000000000..15a4219ef4b --- /dev/null +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js @@ -0,0 +1,115 @@ +import React from 'react' +import PropTypes from 'prop-types' +import styled from 'styled-components' +import { FormattedMessage } from 'react-intl' +import { LinkContainer } from 'react-router-bootstrap' + +import { Button, Icon, Image, Link, Separator, Text, TextGroup } from 'blockchain-info-components' + +const Wrapper = styled.div` + position: relative; + display: ${props => props.displayed ? 'flex' : 'none'}; + flex-direction: row; + justify-content: space-between; + align-items: flex-start; + width: 100%; + background-color: ${props => props.theme['brand-quaternary']}; +` +const BitcoinImage = styled(Image)` + display: none; + height: 230px; + opacity: 0.3; + @media(min-width: 1200px) { display: block; } +` +const Container = styled.div` + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + width: 100%; + margin: 20px 30px 0 30px; +` +const Row = styled.div` + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + width: 100%; + box-sizing: border-box; + @media(min-width: 1200px) { + flex-direction: row; + } +` +const Cell = styled.div` + width: 100%; + padding: 15px; + box-sizing: border-box; + @media(min-width: 768px) { ${props => props.small ? '30%' : '35%'}; } +` +const CloseArrow = styled(Icon)` + height: 30px; + width: 30px; + margin-top: 20px; +` +const BitcoinWelcome = props => { + const { displayed, handleClick } = props + + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) +} + +BitcoinWelcome.propTypes = { + displayed: PropTypes.bool.isRequired, + handleClick: PropTypes.func.isRequired +} + +export default BitcoinWelcome diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/template.js index 9e726602958..a805b3ac7ab 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/template.js @@ -3,6 +3,7 @@ import PropTypes from 'prop-types' import styled from 'styled-components' import { FormattedMessage } from 'react-intl' import { Icon, IconButton, Separator, Text } from 'blockchain-info-components' +import BitcoinWelcome from './BitcoinWelcome' const Wrapper = styled.div` display: flex; @@ -35,6 +36,7 @@ const Empty = props => { return ( + diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js index 2dceb32a31b..33c04f5de3d 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js @@ -36,7 +36,7 @@ const Row = styled.div` align-items: center; width: 100%; box-sizing: border-box; - @media(min-width: 1200px) { + @media(min-width: 1200px) { flex-direction: row; } ` @@ -71,7 +71,7 @@ const EtherWelcome = props => { - + From 7e71add16583f6cb24587e62496e5c483f51052e Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 16:29:11 +0100 Subject: [PATCH 10/22] fix(Welcome): close welcome modal with x --- packages/blockchain-info-components/src/Images/Image.js | 7 +++++-- .../src/assets/locales/en.json | 2 +- .../TransactionListItem/__snapshots__/index.spec.js.snap | 2 ++ .../src/data/preferences/actionTypes.js | 4 ++++ .../src/data/preferences/actions.js | 4 ++++ .../Bch/Content/Empty/BitcoinCashWelcome/template.js | 2 +- .../Bitcoin/Content/Empty/BitcoinWelcome/template.js | 3 ++- .../Ether/Content/Empty/EtherWelcome/template.js | 2 +- 8 files changed, 20 insertions(+), 6 deletions(-) diff --git a/packages/blockchain-info-components/src/Images/Image.js b/packages/blockchain-info-components/src/Images/Image.js index 8f660c7721c..ad9e629887c 100644 --- a/packages/blockchain-info-components/src/Images/Image.js +++ b/packages/blockchain-info-components/src/Images/Image.js @@ -7,6 +7,7 @@ import Images from './Images' const BaseImage = styled.img` width: ${props => props.width}; height: ${props => props.height}; + color: ${props => props.color}; ` const Image = (props) => { @@ -19,13 +20,15 @@ const Image = (props) => { Image.defaultProps = { width: 'auto', - height: 'auto' + height: 'auto', + color: 'auto' } Image.propTypes = { name: PropTypes.string.isRequired, width: PropTypes.string, - height: PropTypes.string + height: PropTypes.string, + color: PropTypes.string } export default Image diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json index 326f48ee437..712caf18769 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json @@ -1001,7 +1001,7 @@ "scenes.transactions.bitcoin.content.empty.request": "Request", "scenes.transaction.ether.content.empty.etherwelcome.getstarted": "Get started with ether", "scenes.transaction.ether.content.empty.etherwelcome.welcome": "Welcome to Ether", - "scenes.transaction.ether.content.empty.etherwelcome.learnmore": "Learn Mores", + "scenes.transaction.ether.content.empty.etherwelcome.learnmore": "Learn More", "scenes.transaction.ether.content.empty.etherwelcome.what": "What is ether?", "scenes.transaction.ether.content.empty.etherwelcome.currency": "Ether is a digital currency.", "scenes.transaction.ether.content.empty.etherwelcome.transact": "Like Bitcoin, it enables people around the world to transact, save, and hedge their way to a better financial future.", diff --git a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/__snapshots__/index.spec.js.snap b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/__snapshots__/index.spec.js.snap index 3c04342d290..b1b88a17009 100644 --- a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/__snapshots__/index.spec.js.snap +++ b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/__snapshots__/index.spec.js.snap @@ -31,6 +31,8 @@ exports[`ListItemContainer renders correctly 1`] = ` Object { "setCulture": [Function], "setEtherWelcome": [Function], + "setBitcoinWelcome": [Function], + "setBitcoinCashWelcome": [Function], "setLanguage": [Function], "setTheme": [Function], "toggleCoinDisplayed": [Function], diff --git a/packages/blockchain-wallet-v4-frontend/src/data/preferences/actionTypes.js b/packages/blockchain-wallet-v4-frontend/src/data/preferences/actionTypes.js index 0dad9f6f2a3..0c5d0037729 100644 --- a/packages/blockchain-wallet-v4-frontend/src/data/preferences/actionTypes.js +++ b/packages/blockchain-wallet-v4-frontend/src/data/preferences/actionTypes.js @@ -7,3 +7,7 @@ export const SET_THEME = 'SET_THEME' export const TOGGLE_COIN_DISPLAY = 'TOGGLE_COIN_DISPLAY' export const SET_ETHER_WELCOME = 'SET_ETHER_WELCOME' + +export const SET_BITCOIN_WELCOME = 'SET_BITCOIN_WELCOME' + +export const SET_BITCOIN_CASH_WELCOME = 'SET_BITCOIN_CASH_WELCOME' diff --git a/packages/blockchain-wallet-v4-frontend/src/data/preferences/actions.js b/packages/blockchain-wallet-v4-frontend/src/data/preferences/actions.js index 6ab5c6dc0a9..31996bbbddf 100644 --- a/packages/blockchain-wallet-v4-frontend/src/data/preferences/actions.js +++ b/packages/blockchain-wallet-v4-frontend/src/data/preferences/actions.js @@ -9,3 +9,7 @@ export const setTheme = (theme) => ({ type: AT.SET_THEME, payload: { theme } }) export const toggleCoinDisplayed = () => ({ type: AT.TOGGLE_COIN_DISPLAY }) export const setEtherWelcome = (displayed) => ({ type: AT.SET_ETHER_WELCOME, payload: { displayed } }) + +export const setBitcoinWelcome = (displayed) => ({ type: AT.SET_BITCOIN_WELCOME, payload: { displayed } }) + +export const setBitcoinCashWelcome = (displayed) => ({ type: AT.SET_BITCOIN_CASH_WELCOME, payload: { displayed } }) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js index 7a51ab5aaeb..590ccc3aa6f 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js @@ -60,7 +60,7 @@ const BitcoinCashWelcome = props => { - diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js index 15a4219ef4b..b7ece74a4e6 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js @@ -19,6 +19,7 @@ const BitcoinImage = styled(Image)` display: none; height: 230px; opacity: 0.3; + color: ${props => props.theme['brand-tertiary']}; @media(min-width: 1200px) { display: block; } ` const Container = styled.div` @@ -60,7 +61,7 @@ const BitcoinWelcome = props => { - diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js index 33c04f5de3d..56483150310 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js @@ -60,7 +60,7 @@ const EtherWelcome = props => { - From 9101892580fcad651bc2696623c59a20a8cf5520 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Fri, 4 May 2018 17:03:39 +0100 Subject: [PATCH 11/22] fix(Welcome): copy size --- .../Bitcoin/Content/Empty/BitcoinWelcome/template.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js index b7ece74a4e6..0407a9e3411 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js @@ -68,10 +68,10 @@ const BitcoinWelcome = props => { - + - + From 02ab8ec2f2b2b4edf1286771c3469080c54990a0 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Sat, 5 May 2018 19:19:48 +0100 Subject: [PATCH 12/22] style(Welcome): tx feed welcome styling --- .../src/Buttons/Button.js | 4 +- .../src/Images/img/half-bitcoincash.svg | 57 +++++++++++++------ .../src/assets/locales/en.json | 2 +- .../Empty/BitcoinCashWelcome/template.js | 40 ++++++------- .../Content/Empty/BitcoinWelcome/template.js | 31 +++++----- .../Content/Empty/EtherWelcome/template.js | 45 ++++++++------- 6 files changed, 105 insertions(+), 74 deletions(-) diff --git a/packages/blockchain-info-components/src/Buttons/Button.js b/packages/blockchain-info-components/src/Buttons/Button.js index da09a805f9f..53edd6c0b98 100644 --- a/packages/blockchain-info-components/src/Buttons/Button.js +++ b/packages/blockchain-info-components/src/Buttons/Button.js @@ -14,6 +14,7 @@ const BaseButton = styled.button.attrs({ min-width: ${props => props.width ? props.width : '140px'}; height: ${props => props.height}; padding: ${props => props.padding ? props.padding : '10px 15px'}; + margin: ${props => props.margin}; box-sizing: border-box; user-select: none; text-align: center; @@ -87,7 +88,8 @@ Button.propTypes = { uppercase: PropTypes.bool, capitalize: PropTypes.bool, width: PropTypes.string, - padding: PropTypes.string + padding: PropTypes.string, + margin: PropTypes.string } Button.defaultProps = { diff --git a/packages/blockchain-info-components/src/Images/img/half-bitcoincash.svg b/packages/blockchain-info-components/src/Images/img/half-bitcoincash.svg index ed8e394993b..e2825fa1a8b 100644 --- a/packages/blockchain-info-components/src/Images/img/half-bitcoincash.svg +++ b/packages/blockchain-info-components/src/Images/img/half-bitcoincash.svg @@ -1,18 +1,41 @@ - - - - Artboard - Created with Sketch. - - - - - - - - - - - - + + + + + + + +Fill 5 +Created with Sketch. + + + + + + + diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json index 712caf18769..1cc440c019c 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json @@ -1000,7 +1000,7 @@ "scenes.transactions.bitcoin.content.empty.send": "Send", "scenes.transactions.bitcoin.content.empty.request": "Request", "scenes.transaction.ether.content.empty.etherwelcome.getstarted": "Get started with ether", - "scenes.transaction.ether.content.empty.etherwelcome.welcome": "Welcome to Ether", + "scenes.transaction.ether.content.empty.etherwelcome.welcome": "Welcome to", "scenes.transaction.ether.content.empty.etherwelcome.learnmore": "Learn More", "scenes.transaction.ether.content.empty.etherwelcome.what": "What is ether?", "scenes.transaction.ether.content.empty.etherwelcome.currency": "Ether is a digital currency.", diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js index 590ccc3aa6f..d4d1770c71f 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js @@ -27,7 +27,6 @@ const Container = styled.div` justify-content: flex-start; align-items: flex-start; width: 100%; - margin: 20px 30px 0 30px; ` const Row = styled.div` display: flex; @@ -42,7 +41,7 @@ const Row = styled.div` ` const Cell = styled.div` width: 100%; - padding: 15px; + padding: 15px 0 15px 15px; box-sizing: border-box; @media(min-width: 768px) { ${props => props.small ? '30%' : '35%'}; } ` @@ -58,54 +57,57 @@ const BitcoinCashWelcome = props => { - - - - - - - + + + + + - + - + - + - + - + - + - + + + + + + - + ) } diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js index 0407a9e3411..17f6dbeecd8 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js @@ -23,12 +23,10 @@ const BitcoinImage = styled(Image)` @media(min-width: 1200px) { display: block; } ` const Container = styled.div` - display: flex; flex-direction: column; justify-content: flex-start; align-items: flex-start; width: 100%; - margin: 20px 30px 0 30px; ` const Row = styled.div` display: flex; @@ -43,9 +41,10 @@ const Row = styled.div` ` const Cell = styled.div` width: 100%; - padding: 15px; + padding: 15px 0 15px 15px; box-sizing: border-box; @media(min-width: 768px) { ${props => props.small ? '30%' : '35%'}; } + ` const CloseArrow = styled(Icon)` height: 30px; @@ -59,13 +58,6 @@ const BitcoinWelcome = props => { - - - - - @@ -77,33 +69,40 @@ const BitcoinWelcome = props => { - + - + - + - + - + + + + + + - + ) } diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js index 56483150310..e9eb90fca35 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Content/Empty/EtherWelcome/template.js @@ -27,7 +27,6 @@ const Container = styled.div` justify-content: flex-start; align-items: flex-start; width: 100%; - margin: 20px 30px 0 30px; ` const Row = styled.div` display: flex; @@ -36,13 +35,16 @@ const Row = styled.div` align-items: center; width: 100%; box-sizing: border-box; + button { + margin-top: 10px; + } @media(min-width: 1200px) { flex-direction: row; } ` const Cell = styled.div` width: 100%; - padding: 15px; + padding: 15px 0 15px 15px; box-sizing: border-box; @media(min-width: 768px) { ${props => props.small ? '30%' : '35%'}; } ` @@ -58,57 +60,60 @@ const EtherWelcome = props => { - - - - - - - + + - + + + + - + - + - + - + - + - + - + + + + + + - + ) } From 02984d84ae3f2158123464ce6a2f499043f0fdee Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Mon, 7 May 2018 06:08:32 -0400 Subject: [PATCH 13/22] feature(Welcome): get started with bitcoin directs to buy --- .../Bitcoin/Content/Empty/BitcoinWelcome/template.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js index 17f6dbeecd8..20126cceca6 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js @@ -95,7 +95,7 @@ const BitcoinWelcome = props => { - + From 4012b8145c3c5f8c348832415a26dfa81ca32d70 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Mon, 7 May 2018 06:40:43 -0400 Subject: [PATCH 14/22] fix(Copy): remove html text from default messages --- .../src/assets/locales/en.json | 2 +- .../src/components/Faq/FaqContent/index.js | 8 ++++---- .../src/modals/MobileNumberVerify/template.js | 4 ++-- .../src/modals/RequestBch/template.success.js | 2 +- .../modals/RequestBitcoin/FirstStep/template.success.js | 2 +- .../src/modals/SendBch/FirstStep/template.success.js | 2 +- .../src/modals/SendBitcoin/FirstStep/template.success.js | 2 +- .../src/modals/SendEther/FirstStep/template.success.js | 2 +- .../src/modals/ShowXPub/template.js | 2 +- .../src/scenes/Home/DidYouKnow/template.js | 2 +- .../TwoStepVerification/Yubikey/template.success.js | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json index 1cc440c019c..896905dd27b 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json @@ -218,7 +218,7 @@ "modals.mobilelogin.login": "Logging in with Mobile", "modals.mobilelogin.openapp": "Open your Blockchain App on your mobile device and go to Settings.", "modals.mobilelogin.tapweb": "Tap Log in to Web Wallet.", - "modals.mobilelogin.usecamera": "Using your computer s camera, scan the QR code that appears on your device.", + "modals.mobilelogin.usecamera": "Using your computer's camera, scan the QR code that appears on your device.", "modals.mobilelogin.cancel": "Cancel", "modals.mobilenumberchange.title1": "Change Mobile Number", "modals.mobilenumberchange.explain": "Use your mobile phone to receive a one-time-password after a login attempt.", diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js index 24b6e8d8f00..71d9ef3cd7a 100644 --- a/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/components/Faq/FaqContent/index.js @@ -36,7 +36,7 @@ const FaqContent = [

- + }, { question: , @@ -47,16 +47,16 @@ const FaqContent = [

- + }, { - question: , + question: , answer: - +

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js index f73a1d42c95..10e4f060287 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/MobileNumberVerify/template.js @@ -42,9 +42,9 @@ const MobileNumberVerify = (props) => { - + - + diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/RequestBch/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/RequestBch/template.success.js index 9eecc676877..01bc8cbbd51 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/RequestBch/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/RequestBch/template.success.js @@ -56,7 +56,7 @@ const RequestBch = props => { - + diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/RequestBitcoin/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/RequestBitcoin/FirstStep/template.success.js index ff979febd3f..c0194744c8b 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/RequestBitcoin/FirstStep/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/RequestBitcoin/FirstStep/template.success.js @@ -47,7 +47,7 @@ const FirstStep = props => {
- + diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/SendBch/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/SendBch/FirstStep/template.success.js index 421a63c8f01..9274161a4ec 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/SendBch/FirstStep/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/SendBch/FirstStep/template.success.js @@ -74,7 +74,7 @@ const FirstStep = props => { - + diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/SendBitcoin/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/SendBitcoin/FirstStep/template.success.js index f4e14c2c99e..29f1969cc54 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/SendBitcoin/FirstStep/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/SendBitcoin/FirstStep/template.success.js @@ -127,7 +127,7 @@ const FirstStep = props => { - + diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/SendEther/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/SendEther/FirstStep/template.success.js index 995d99d2122..49b541acc74 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/SendEther/FirstStep/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/SendEther/FirstStep/template.success.js @@ -54,7 +54,7 @@ const FirstStep = props => { - + diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ShowXPub/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/ShowXPub/template.js index 9005251d839..069ccd93697 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/ShowXPub/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/ShowXPub/template.js @@ -23,7 +23,7 @@ const FirstStep = () => ( - +
) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Home/DidYouKnow/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Home/DidYouKnow/template.js index cd2aac3572e..6f5ccbe5644 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Home/DidYouKnow/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Home/DidYouKnow/template.js @@ -94,7 +94,7 @@ const selectContent = (number) => { case 14: return case 15: return case 16: return - case 17: return + case 17: return case 18: return case 19: return case 20: return diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/TwoStepVerification/Yubikey/template.success.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/TwoStepVerification/Yubikey/template.success.js index ef3dbd62008..7c34b13804e 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/TwoStepVerification/Yubikey/template.success.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/TwoStepVerification/Yubikey/template.success.js @@ -71,7 +71,7 @@ const Yubikey = props => { - + From da0fca811b12ba800cbed15bcb33861cf6362224 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Mon, 7 May 2018 06:54:47 -0400 Subject: [PATCH 15/22] fix(Strings): remove html from default messages --- .../src/assets/locales/en.json | 6 +++--- .../src/components/Terms/index.js | 2 +- .../SecurityCenter/Advanced/ActivityLogging/template.js | 2 +- .../scenes/SecurityCenter/Advanced/IPWhitelist/template.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json index 896905dd27b..3a759ad28ca 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json @@ -96,7 +96,7 @@ "components.form.tabmenutransactionstatus.received": "Received", "components.form.tabmenutransactionstatus.sent": "Sent", "components.form.tabmenutransactionstatus.transferred": "Transferred", - "scenes.register.registerform.shapeshift.read": "I agree to ShapeShift's", + "scenes.register.registerform.shapeshift.read": "I agree to ShapeShift's", "scenes.register.registerform.shapeshift.terms": "terms and conditions", "scenes.register.registerform.blockchain.read": "I have read and agree to the", "scenes.register.registerform.blockchain.terms": "Terms of Service", @@ -763,7 +763,7 @@ "scenes.securitysettings.advancedsecurity.activitylogging.title": "Activity Logging", "scenes.securitysettings.advancedsecurity.activitylogging.enabled": "Enabled", "scenes.securitysettings.advancedsecurity.activitylogging.disabled": "Disabled", - "scenes.securitysettings.advancedsecurity.activitylogging.description": "Enable for all your wallet activity to be displayed in your dashboard's activity feed.", + "scenes.securitysettings.advancedsecurity.activitylogging.description": "Enable for all your wallet activity to be displayed in your dashboard's activity feed.", "scenes.securitysettings.advancedsecurity.activitylogging.settings.disable": "Disable", "scenes.securitysettings.advancedsecurity.activitylogging..settings.enable": "Enable", "scenes.securitysettings.apiaccess.title": "API Access", @@ -775,7 +775,7 @@ "scenes.securitysettings.advancedsettings.ipwhitelist.settings.cancel": "Cancel", "scenes.securitysettings.advancedsettings.ipwhitelist.settings.save": "Save", "scenes.securitysettings.advancedsettings.ipwhitelist.title": "IP Whitelist", - "scenes.securitysettings.advancedsettings.ipwhitelist.description": "Allow login without email authentication from the following list of IP addresses. Enter IP addresses you'd like to whitelist separated by commas. Use % as a wildcard.", + "scenes.securitysettings.advancedsettings.ipwhitelist.description": "Allow login without email authentication from the following list of IP addresses. Enter IP addresses you'd like to whitelist separated by commas. Use % as a wildcard.", "scenes.securitysettings.advancedsettings.loginiprestriction.title": "Login IP Restriction", "scenes.securitysettings.advancedsettings.loginiprestriction.enabled": "Enabled", "scenes.securitysettings.advancedsettings.loginiprestriction.disabled": "Disabled", diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Terms/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Terms/index.js index c8c5e4cdb61..f5bf5e0a6b0 100644 --- a/packages/blockchain-wallet-v4-frontend/src/components/Terms/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/components/Terms/index.js @@ -17,7 +17,7 @@ const Terms = (props) => { return ( - + diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/ActivityLogging/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/ActivityLogging/template.js index ee87bed5006..74b770c5c16 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/ActivityLogging/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/ActivityLogging/template.js @@ -19,7 +19,7 @@ const ActivityLogging = (props) => { - + diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/IPWhitelist/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/IPWhitelist/template.js index cff26ae09ca..5d3a125bd9f 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/IPWhitelist/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/IPWhitelist/template.js @@ -12,7 +12,7 @@ const IPWhitelist = (props) => { - + From 446647dc2ed0b073cc0599beb4878afad99d7706 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Mon, 7 May 2018 07:00:21 -0400 Subject: [PATCH 16/22] fix tests --- .../src/Badges/__snapshots__/Badge.spec.js.snap | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/blockchain-info-components/src/Badges/__snapshots__/Badge.spec.js.snap b/packages/blockchain-info-components/src/Badges/__snapshots__/Badge.spec.js.snap index bb9891e214d..0251018d119 100644 --- a/packages/blockchain-info-components/src/Badges/__snapshots__/Badge.spec.js.snap +++ b/packages/blockchain-info-components/src/Badges/__snapshots__/Badge.spec.js.snap @@ -8,7 +8,8 @@ exports[`Badge component applestore renders correctly 1`] = ` target="_blank" > Date: Mon, 7 May 2018 07:54:57 -0400 Subject: [PATCH 17/22] fix tests --- .../TransactionListItem/__snapshots__/index.spec.js.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/__snapshots__/index.spec.js.snap b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/__snapshots__/index.spec.js.snap index b1b88a17009..88ba88dbbd6 100644 --- a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/__snapshots__/index.spec.js.snap +++ b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/__snapshots__/index.spec.js.snap @@ -29,10 +29,10 @@ exports[`ListItemContainer renders correctly 1`] = ` minConfirmations={3} preferencesActions={ Object { + "setBitcoinCashWelcome": [Function], + "setBitcoinWelcome": [Function], "setCulture": [Function], "setEtherWelcome": [Function], - "setBitcoinWelcome": [Function], - "setBitcoinCashWelcome": [Function], "setLanguage": [Function], "setTheme": [Function], "toggleCoinDisplayed": [Function], From 6a31439a54002109effb39b1da1a462fd8b27a03 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Mon, 7 May 2018 09:21:11 -0400 Subject: [PATCH 18/22] fix(Private Key) copy --- .../blockchain-wallet-v4-frontend/src/assets/locales/en.json | 4 ++-- .../src/modals/ShowBtcPrivateKey/template.js | 2 +- .../src/modals/ShowEthPrivateKey/template.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json index 3a759ad28ca..c477c45bc37 100644 --- a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json +++ b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json @@ -437,12 +437,12 @@ "sfoxsignup.verify.address.helper2.answer": "Answer2 placeholder", "order_details.method": "Payment Method", "modals.show_priv.warning": "Warning", - "modals.show_priv.warning_message": "Granting others access to this Private Key gives them the ability to send bitcoin from this address. Exposing your Private Key to others is a security risk that may result in lost bitcoin. Do you wish to continue?", + "modals.show_priv.warning_message": "Don't share your private key with anyone. This may result in a loss of funds.", "modals.show_priv.title": "Private Key", "modals.show_priv.close": "Close", "modals.show_priv.continue": "Continue", "modals.show_eth_priv.warning": "Warning", - "modals.show_eth_priv.warning_message": "Granting others access to this Private Key gives them the ability to send ether from this address. Exposing your Private Key to others is a security risk that may result in lost ether. Do you wish to continue?", + "modals.show_eth_priv.warning_message": "Don't share your private key with anyone. This may result in a loss of funds.", "modals.show_eth_priv.title": "Private Key", "modals.show_eth_priv.close": "Close", "modals.show_eth_priv.continue": "Continue", diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ShowBtcPrivateKey/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/ShowBtcPrivateKey/template.js index e61a2f86bc9..b4795cbd16a 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/ShowBtcPrivateKey/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/ShowBtcPrivateKey/template.js @@ -22,7 +22,7 @@ const FirstStep = () => ( - +
) diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ShowEthPrivateKey/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/ShowEthPrivateKey/template.js index f53cb611a60..f30ec760487 100644 --- a/packages/blockchain-wallet-v4-frontend/src/modals/ShowEthPrivateKey/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/modals/ShowEthPrivateKey/template.js @@ -21,7 +21,7 @@ const FirstStep = () => ( - +
) From 3df64eb27fdd830a90e25d13aee6e7027ab04a24 Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Mon, 7 May 2018 10:25:36 -0400 Subject: [PATCH 19/22] fix(Welcome): get started with bitcoin opens request --- .../Content/Empty/BitcoinWelcome/index.js | 9 +++++++-- .../Content/Empty/BitcoinWelcome/template.js | 16 ++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/index.js index 7ffac14f2b9..5d92e28781d 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/index.js @@ -9,15 +9,19 @@ class BitcoinWelcomeContainer extends React.PureComponent { constructor (props) { super(props) this.handleClick = this.handleClick.bind(this) + this.handleRequest = this.handleRequest.bind(this) } handleClick () { this.props.preferencesActions.setBitcoinWelcome(false) } + handleRequest () { + this.props.modalActions.showModal('RequestBitcoin') + } render () { const { showBitcoinWelcome } = this.props - return + return } } @@ -26,7 +30,8 @@ const mapStateToProps = state => ({ }) const mapDispatchToProps = dispatch => ({ - preferencesActions: bindActionCreators(actions.preferences, dispatch) + preferencesActions: bindActionCreators(actions.preferences, dispatch), + modalActions: bindActionCreators(actions.modals, dispatch) }) export default connect(mapStateToProps, mapDispatchToProps)(BitcoinWelcomeContainer) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js index 20126cceca6..2ce7ee42065 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bitcoin/Content/Empty/BitcoinWelcome/template.js @@ -2,7 +2,7 @@ import React from 'react' import PropTypes from 'prop-types' import styled from 'styled-components' import { FormattedMessage } from 'react-intl' -import { LinkContainer } from 'react-router-bootstrap' +// import { LinkContainer } from 'react-router-bootstrap' import { Button, Icon, Image, Link, Separator, Text, TextGroup } from 'blockchain-info-components' @@ -52,7 +52,7 @@ const CloseArrow = styled(Icon)` margin-top: 20px; ` const BitcoinWelcome = props => { - const { displayed, handleClick } = props + const { displayed, handleClick, handleRequest } = props return ( @@ -95,11 +95,10 @@ const BitcoinWelcome = props => { - - - + {/* use link container to set up conditional to send to buy if available */} + @@ -109,7 +108,8 @@ const BitcoinWelcome = props => { BitcoinWelcome.propTypes = { displayed: PropTypes.bool.isRequired, - handleClick: PropTypes.func.isRequired + handleClick: PropTypes.func.isRequired, + handleRequest: PropTypes.func.isRequired } export default BitcoinWelcome From 865913dda59b0921fe79397ed584670b92a1bfcc Mon Sep 17 00:00:00 2001 From: TheLeoB Date: Mon, 7 May 2018 10:32:36 -0400 Subject: [PATCH 20/22] fix(Welcome): get started with bitcoin cash opens request --- .../Bch/Content/Empty/BitcoinCashWelcome/index.js | 9 +++++++-- .../Content/Empty/BitcoinCashWelcome/template.js | 15 +++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/index.js index 4d2383a4ba5..1eddf3f8300 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/index.js @@ -9,15 +9,19 @@ class BitcoinCashWelcomeContainer extends React.PureComponent { constructor (props) { super(props) this.handleClick = this.handleClick.bind(this) + this.handleRequest = this.handleRequest.bind(this) } handleClick () { this.props.preferencesActions.setBitcoinCashWelcome(false) } + handleRequest () { + this.props.modalActions.showModal('RequestBch') + } render () { const { showBitcoinCashWelcome } = this.props - return + return } } @@ -26,7 +30,8 @@ const mapStateToProps = state => ({ }) const mapDispatchToProps = dispatch => ({ - preferencesActions: bindActionCreators(actions.preferences, dispatch) + preferencesActions: bindActionCreators(actions.preferences, dispatch), + modalActions: bindActionCreators(actions.modals, dispatch) }) export default connect(mapStateToProps, mapDispatchToProps)(BitcoinCashWelcomeContainer) diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js index d4d1770c71f..c3ca8174028 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Bch/Content/Empty/BitcoinCashWelcome/template.js @@ -2,7 +2,7 @@ import React from 'react' import PropTypes from 'prop-types' import styled from 'styled-components' import { FormattedMessage } from 'react-intl' -import { LinkContainer } from 'react-router-bootstrap' +// import { LinkContainer } from 'react-router-bootstrap' import { Button, Icon, Image, Link, Separator, Text, TextGroup } from 'blockchain-info-components' @@ -51,7 +51,7 @@ const CloseArrow = styled(Icon)` margin-top: 20px; ` const BitcoinCashWelcome = props => { - const { displayed, handleClick } = props + const { displayed, handleClick, handleRequest } = props return ( @@ -100,11 +100,9 @@ const BitcoinCashWelcome = props => { - - - + @@ -114,7 +112,8 @@ const BitcoinCashWelcome = props => { BitcoinCashWelcome.propTypes = { displayed: PropTypes.bool.isRequired, - handleClick: PropTypes.func.isRequired + handleClick: PropTypes.func.isRequired, + handleRequest: PropTypes.func.isRequired } export default BitcoinCashWelcome From 04a0d398c3bdd2e498887e2c038fe91b5c922146 Mon Sep 17 00:00:00 2001 From: schnogz Date: Mon, 7 May 2018 10:44:27 -0400 Subject: [PATCH 21/22] add issue template --- .github/ISSUE_TEMPLATE.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000000..731b3cb7b76 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,16 @@ +# 🐛 Bug Report 🐛 + +## Description +Provide a clear and concise description of the issue. + +## Expected Behavior +Explain what you would expect to happen. + +## Reproduction Steps +Enter detailed steps to reproduce the issue. + +## Screenshots/Logs +If available, please provide any relevant screenshots or logs. + +## Additional Information +Add any addition information that might be useful to our team. From 79bfca27312a81fa59469930b6f70eef635cfcea Mon Sep 17 00:00:00 2001 From: schnogz Date: Mon, 7 May 2018 11:09:52 -0400 Subject: [PATCH 22/22] update pull request template --- .github/PULL_REQUEST_TEMPLATE.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 03878b4916e..31775c70faf 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1 +1,25 @@ -- [ ] Spot checked +## Description +Add a concise explanation of the changes. + +## Change Type +Please enter one or more of the following: +- Feature +- Bug Fix +- CI/CD +- Upgrades +- Other (add explanation) + +## Testing Steps +Detail the steps required for the reviewer(s) to verify and test these changes. + +## PR Creator Checklist +- [ ] Code compiles correctly +- [ ] No lint issues exist (verified via `yarn lint`) +- [ ] All unit tests pass (verified via `yarn test`) +- [ ] Updated `README.md` and other documentation (if necessary) + +## PR Reviewer Checklist +- [ ] Change validated and application spot checked +- [ ] Code styles and best practices met +- [ ] Code is readable and commented when necessary +