diff --git a/web/cashtab/src/components/Receive/Receive.js b/web/cashtab/src/components/Receive/Receive.js index b3ee1e862..53dc4e25c 100644 --- a/web/cashtab/src/components/Receive/Receive.js +++ b/web/cashtab/src/components/Receive/Receive.js @@ -1,137 +1,149 @@ import React from 'react'; import styled from 'styled-components'; import PropTypes from 'prop-types'; import { WalletContext } from 'utils/context'; import OnBoarding from 'components/OnBoarding/OnBoarding'; import { QRCode } from 'components/Common/QRCode'; import { currency } from 'components/Common/Ticker.js'; import { LoadingCtn } from 'components/Common/Atoms'; import BalanceHeader from 'components/Common/BalanceHeader'; import BalanceHeaderFiat from 'components/Common/BalanceHeaderFiat'; import { WalletInfoCtn, ZeroBalanceHeader } from 'components/Common/Atoms'; import WalletLabel from 'components/Common/WalletLabel'; import { getWalletState } from 'utils/cashMethods'; +import { Alert } from 'antd'; export const ReceiveCtn = styled.div` width: 100%; h2 { color: ${props => props.theme.contrast}; margin: 0 0 20px; margin-top: 10px; } `; +const InfoContainer = styled.div` + width: 80%; + margin: auto; +`; const ReceiveWithWalletPresent = ({ wallet, cashtabSettings, balances, fiatPrice, changeCashtabSettings, }) => { return ( {!balances.totalBalance ? ( You currently have 0 {currency.ticker}
Deposit some funds to use this feature
) : ( <> )}
{wallet && ((wallet.Path245 && wallet.Path145) || wallet.Path1899) && ( <> {wallet.Path1899 ? ( <> ) : ( <> )} )} + + +
); }; const Receive = () => { const ContextValue = React.useContext(WalletContext); const { wallet, previousWallet, loading, cashtabSettings, changeCashtabSettings, fiatPrice, } = ContextValue; const walletState = getWalletState(wallet); const { balances } = walletState; return ( <> {loading ? ( ) : ( <> {(wallet && wallet.Path1899) || (previousWallet && previousWallet.path1899) ? ( ) : ( )} )} ); }; ReceiveWithWalletPresent.propTypes = { balances: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), fiatPrice: PropTypes.number, wallet: PropTypes.object, cashtabSettings: PropTypes.oneOfType([ PropTypes.shape({ fiatCurrency: PropTypes.string, sendModal: PropTypes.bool, autoCameraOn: PropTypes.bool, hideMessagesFromUnknownSender: PropTypes.bool, toggleShowHideBalance: PropTypes.bool, }), PropTypes.bool, ]), changeCashtabSettings: PropTypes.func, }; export default Receive; diff --git a/web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap b/web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap index f73938415..b3563e539 100644 --- a/web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap +++ b/web/cashtab/src/components/Receive/__tests__/__snapshots__/Receive.test.js.snap @@ -1,735 +1,919 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP @generated exports[`Wallet with BCH balances 1`] = `

MigrationTestAlpha

edit.svg
You currently have 0 XEC
Deposit some funds to use this feature
Copied
ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd
ecash: qzagy47m vh6qxkvcn3acjnz73rkhkc6y7c cxkrr6zd
+
+
+
+
+ Cashtab now supports receiving eTokens at your eCash address +
+
+ +
+
`; exports[`Wallet with BCH balances and tokens 1`] = `

MigrationTestAlpha

edit.svg
You currently have 0 XEC
Deposit some funds to use this feature
Copied
ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd
ecash: qzagy47m vh6qxkvcn3acjnz73rkhkc6y7c cxkrr6zd
+
+
+
+
+ Cashtab now supports receiving eTokens at your eCash address +
+
+ +
+
`; exports[`Wallet with BCH balances and tokens and state field 1`] = `

MigrationTestAlpha

edit.svg
0.06 XEC
Copied
ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd
ecash: qzagy47m vh6qxkvcn3acjnz73rkhkc6y7c cxkrr6zd
+
+
+
+
+ Cashtab now supports receiving eTokens at your eCash address +
+
+ +
+
`; exports[`Wallet without BCH balance 1`] = `

MigrationTestAlpha

edit.svg
You currently have 0 XEC
Deposit some funds to use this feature
Copied
ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd
ecash: qzagy47m vh6qxkvcn3acjnz73rkhkc6y7c cxkrr6zd
+
+
+
+
+ Cashtab now supports receiving eTokens at your eCash address +
+
+ +
+
`; exports[`Without wallet defined 1`] = `

Welcome to Cashtab!

Cashtab is an open source, non-custodial web wallet for eCash .

Want to learn more? Check out the Cashtab documentation.

`;