diff --git a/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap b/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap index ae1260646..12f04e290 100644 --- a/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap +++ b/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap @@ -1,701 +1,701 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP @generated exports[`Wallet with BCH balances 1`] = ` Array [

MigrationTestAlpha

edit.svg
You currently have 0 XEC
Deposit some funds to use this feature
,
,
XEC Airdrop Calculator
, ] `; exports[`Wallet with BCH balances and tokens 1`] = ` Array [

MigrationTestAlpha

edit.svg
You currently have 0 XEC
Deposit some funds to use this feature
,
,
XEC Airdrop Calculator
, ] `; exports[`Wallet with BCH balances and tokens and state field 1`] = ` Array [

MigrationTestAlpha

edit.svg
0.06 XEC
,
,
XEC Airdrop Calculator
, ] `; exports[`Wallet without BCH balance 1`] = ` Array [

MigrationTestAlpha

edit.svg
You currently have 0 XEC
Deposit some funds to use this feature
,
,
XEC Airdrop Calculator
, ] `; exports[`Without wallet defined 1`] = ` Array [
edit.svg
You currently have 0 XEC
Deposit some funds to use this feature
,
,
XEC Airdrop Calculator
, ] `; diff --git a/web/cashtab/src/components/Common/Atoms.js b/web/cashtab/src/components/Common/Atoms.js index acdc54c80..232aec6b8 100644 --- a/web/cashtab/src/components/Common/Atoms.js +++ b/web/cashtab/src/components/Common/Atoms.js @@ -1,102 +1,102 @@ import styled from 'styled-components'; import { Link } from 'react-router-dom'; export const WarningFont = styled.div` color: ${props => props.theme.wallet.text.primary}; `; export const LoadingCtn = styled.div` width: 100%; display: flex; align-items: center; justify-content: center; height: 400px; flex-direction: column; svg { width: 50px; height: 50px; fill: ${props => props.theme.eCashBlue}; } `; export const SidePaddingCtn = styled.div` padding: 0px 30px; @media (max-width: 768px) { padding: 0px 15px; } `; export const FormLabel = styled.label` font-size: 16px; margin-bottom: 5px; text-align: left; width: 100%; display: inline-block; color: ${props => props.theme.contrast}; `; export const WalletInfoCtn = styled.div` background: ${props => props.theme.walletInfoContainer}; width: 100%; - padding: 40px 20px; + padding: 12px 20px; `; export const BalanceHeaderFiatWrap = styled.div` color: ${props => props.theme.contrast}; width: 100%; font-size: 16px; @media (max-width: 768px) { font-size: 16px; } `; export const BalanceHeaderWrap = styled.div` color: ${props => props.theme.contrast}; width: 100%; font-size: 28px; margin-bottom: 0px; font-weight: bold; line-height: 1.4em; @media (max-width: 768px) { font-size: 24px; } `; export const ZeroBalanceHeader = styled.div` color: ${props => props.theme.contrast}; width: 100%; font-size: 14px; margin-bottom: 5px; `; export const TokenParamLabel = styled.span` font-weight: bold; `; export const MessageVerificationParamLabel = styled.span` font-weight: bold; `; export const AlertMsg = styled.p` color: ${props => props.theme.forms.error} !important; `; export const ConvertAmount = styled.div` color: ${props => props.theme.contrast}; width: 100%; font-size: 14px; margin-bottom: 10px; @media (max-width: 768px) { font-size: 12px; } `; export const StyledLink = styled(Link)` color: ${props => props.theme.buttons.styledLink}; text-decoration: none; padding: 8px; position: relative; border: solid 1px silver; border-radius: 10px; `; diff --git a/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap b/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap index 688835ec0..7712e48ea 100644 --- a/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap +++ b/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap @@ -1,633 +1,633 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP @generated exports[`Wallet with BCH balances 1`] = ` Array [

MigrationTestAlpha

edit.svg
0 XEC
,
πŸŽ‰ Congratulations on your new wallet! πŸŽ‰
Start using the wallet immediately to receive XEC payments, or load it up with XEC to send to others
Create eToken

Tokens sent to your eToken address will appear here

, ] `; exports[`Wallet with BCH balances and tokens 1`] = ` Array [

MigrationTestAlpha

edit.svg
0 XEC
,
πŸŽ‰ Congratulations on your new wallet! πŸŽ‰
Start using the wallet immediately to receive XEC payments, or load it up with XEC to send to others
Create eToken

Tokens sent to your eToken address will appear here

, ] `; exports[`Wallet with BCH balances and tokens and state field 1`] = ` Array [

MigrationTestAlpha

edit.svg
0.06 XEC
,
πŸŽ‰ Congratulations on your new wallet! πŸŽ‰
Start using the wallet immediately to receive XEC payments, or load it up with XEC to send to others
Create eToken
, ] `; exports[`Wallet without BCH balance 1`] = ` Array [

MigrationTestAlpha

edit.svg
0 XEC
,
πŸŽ‰ Congratulations on your new wallet! πŸŽ‰
Start using the wallet immediately to receive XEC payments, or load it up with XEC to send to others
Create eToken

Tokens sent to your eToken address will appear here

, ] `; 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.

`; diff --git a/web/cashtab/src/components/Receive/Receive.js b/web/cashtab/src/components/Receive/Receive.js index e7db2e799..4fa0df0f5 100644 --- a/web/cashtab/src/components/Receive/Receive.js +++ b/web/cashtab/src/components/Receive/Receive.js @@ -1,136 +1,146 @@ 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'; +const QrCodeCtn = styled.div``; + export const ReceiveCtn = styled.div` width: 100%; h2 { color: ${props => props.theme.contrast}; margin: 0 0 20px; margin-top: 10px; } + ${QrCodeCtn} { + margin-top: 12%; + @media (max-width: 1000px) { + margin-top: 8%; + } + } `; 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.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 b3563e539..2f0183c81 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,919 +1,935 @@ // 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: - - + + ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd + +
+ - qzagy47m - - vh6qxkvcn3acjnz73rkhkc6y7c - + + + +
- cxkrr6zd - + + + 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: - - + + ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd + +
+ - qzagy47m - - vh6qxkvcn3acjnz73rkhkc6y7c - + + + +
- cxkrr6zd - + + + 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: - - + + ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd + +
+ - qzagy47m - - vh6qxkvcn3acjnz73rkhkc6y7c - + + + +
- cxkrr6zd - + + + 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: - - + + ecash:qzagy47mvh6qxkvcn3acjnz73rkhkc6y7ccxkrr6zd + +
+ - qzagy47m - - vh6qxkvcn3acjnz73rkhkc6y7c - + + + +
- cxkrr6zd - + + + 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.

`; diff --git a/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap b/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap index e993af747..7138bab04 100644 --- a/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap +++ b/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap @@ -1,2902 +1,2902 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP @generated exports[`Wallet with BCH balances 1`] = ` Array [

MigrationTestAlpha

edit.svg
You currently have 0 XEC
Deposit some funds to use this feature
,
Multiple Recipients:Β Β 
XEC
max