diff --git a/web/cashtab/extension/src/components/App.js b/web/cashtab/extension/src/components/App.js --- a/web/cashtab/extension/src/components/App.js +++ b/web/cashtab/extension/src/components/App.js @@ -9,6 +9,7 @@ ReceiveIcon, SettingsIcon, AirdropIcon, + ThemedSignAndVerifyMsg, } from 'components/Common/CustomIcons'; import '../index.css'; import styled, { ThemeProvider, createGlobalStyle } from 'styled-components'; @@ -239,8 +240,8 @@ background-color: ${props => props.theme.walletBackground}; border: none; color: ${props => props.theme.contrast}; + gap: 6px; cursor: pointer; - gap: 1rem; &:hover { color: ${props => props.theme.navActive}; svg { @@ -249,8 +250,13 @@ } svg { fill: ${props => props.theme.contrast}; - width: 26px; + max-width: 26px; height: auto; + flex: 1; + } + p { + flex: 2; + margin-top: 5px; } `; export const NavButton = styled.button` @@ -591,16 +597,27 @@ } > {' '} - Airdrop +

Airdrop

+ + history.push('/signverifymsg') + } + > +

Sign & Verify

+ +
history.push('/configure') } > - Settings +

Settings

diff --git a/web/cashtab/src/assets/audit.svg b/web/cashtab/src/assets/audit.svg new file mode 100644 --- /dev/null +++ b/web/cashtab/src/assets/audit.svg @@ -0,0 +1 @@ + \ No newline at end of file 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 --- a/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap +++ b/web/cashtab/src/components/Airdrop/__tests__/__snapshots__/Airdrop.test.js.snap @@ -3,13 +3,13 @@ exports[`Wallet with BCH balances 1`] = ` Array [

MigrationTestAlpha

@@ -51,7 +51,7 @@
You currently have 0 XEC @@ -61,7 +61,7 @@
,
,
XEC Airdrop Calculator
@@ -143,13 +143,13 @@ exports[`Wallet with BCH balances and tokens 1`] = ` Array [

MigrationTestAlpha

@@ -191,7 +191,7 @@
You currently have 0 XEC @@ -201,7 +201,7 @@
,
,
XEC Airdrop Calculator
@@ -283,13 +283,13 @@ exports[`Wallet with BCH balances and tokens and state field 1`] = ` Array [

MigrationTestAlpha

@@ -331,10 +331,10 @@
0.06 @@ -346,7 +346,7 @@
,
,
XEC Airdrop Calculator
@@ -428,13 +428,13 @@ exports[`Wallet without BCH balance 1`] = ` Array [

MigrationTestAlpha

@@ -476,7 +476,7 @@
You currently have 0 XEC @@ -486,7 +486,7 @@
,
,
XEC Airdrop Calculator
@@ -568,10 +568,10 @@ exports[`Without wallet defined 1`] = ` Array [
You currently have 0 XEC @@ -621,7 +621,7 @@
,
,
XEC Airdrop Calculator
diff --git a/web/cashtab/src/components/App.js b/web/cashtab/src/components/App.js --- a/web/cashtab/src/components/App.js +++ b/web/cashtab/src/components/App.js @@ -9,6 +9,7 @@ ReceiveIcon, SettingsIcon, AirdropIcon, + ThemedSignAndVerifyMsg, } from 'components/Common/CustomIcons'; import '../index.css'; import styled, { ThemeProvider, createGlobalStyle } from 'styled-components'; @@ -216,6 +217,7 @@ props.open ? props.theme.contrast : 'transparent'}; justify-content: center; align-items: center; + @media (max-width: 768px) { right: 0; margin-right: 0; @@ -238,8 +240,8 @@ background-color: ${props => props.theme.walletBackground}; border: none; color: ${props => props.theme.contrast}; + gap: 6px; cursor: pointer; - gap: 1rem; &:hover { color: ${props => props.theme.navActive}; svg { @@ -248,8 +250,13 @@ } svg { fill: ${props => props.theme.contrast}; - width: 26px; + max-width: 26px; height: auto; + flex: 1; + } + p { + flex: 2; + margin-top: 5px; } `; @@ -478,16 +485,27 @@ } > {' '} - Airdrop +

Airdrop

+ + history.push('/signverifymsg') + } + > +

Sign & Verify

+ +
history.push('/configure') } > - Settings +

Settings

diff --git a/web/cashtab/src/components/Common/CustomIcons.js b/web/cashtab/src/components/Common/CustomIcons.js --- a/web/cashtab/src/components/Common/CustomIcons.js +++ b/web/cashtab/src/components/Common/CustomIcons.js @@ -30,6 +30,7 @@ import { ReactComponent as FingerprintSVG } from 'assets/fingerprint-solid.svg'; import { ReactComponent as EyeSVG } from 'assets/eye.svg'; import { ReactComponent as EyeInvisibleSVG } from 'assets/eye-invisible.svg'; +import { ReactComponent as Audit } from 'assets/audit.svg'; export const CashLoadingIcon = ; @@ -152,6 +153,10 @@ cursor: pointer; `; +export const ThemedSignAndVerifyMsg = styled(Audit)` + min-width: 24px; +`; + export const LoadingBlock = styled.div` width: 100%; display: flex; diff --git a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap --- a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap +++ b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap @@ -2,10 +2,10 @@ exports[`Wallet with BCH balances and tokens 1`] = `

,
,
@@ -386,13 +386,13 @@ onClick={[Function]} >

TBS @@ -410,13 +410,13 @@ exports[`Wallet without BCH balance 1`] = ` Array [

MigrationTestAlpha

@@ -458,10 +458,10 @@
0 @@ -472,26 +472,26 @@

,
@@ -539,18 +539,18 @@ exports[`Without wallet defined 1`] = `

Welcome to Cashtab!

Cashtab is an

You currently have 0 XEC @@ -60,7 +60,7 @@
,

0 XEC

= @@ -405,16 +405,16 @@ } >
Advanced
@@ -476,10 +476,10 @@
Sign Message
@@ -538,10 +538,10 @@
Verify Message
@@ -606,13 +606,13 @@ exports[`Wallet with BCH balances and tokens 1`] = ` Array [

MigrationTestAlpha

@@ -654,7 +654,7 @@
You currently have 0 XEC @@ -663,7 +663,7 @@
,

0 XEC

= @@ -1008,16 +1008,16 @@ } >
Advanced
@@ -1079,10 +1079,10 @@
Sign Message
@@ -1141,10 +1141,10 @@
Verify Message
@@ -1209,13 +1209,13 @@ exports[`Wallet with BCH balances and tokens and state field 1`] = ` Array [

MigrationTestAlpha

@@ -1257,10 +1257,10 @@
0.06 @@ -1271,7 +1271,7 @@
,

0 XEC

= @@ -1616,17 +1616,17 @@ } >
Advanced
@@ -1688,10 +1688,10 @@
Sign Message
@@ -1750,10 +1750,10 @@
Verify Message
@@ -1818,13 +1818,13 @@ exports[`Wallet without BCH balance 1`] = ` Array [

MigrationTestAlpha

@@ -1866,7 +1866,7 @@
You currently have 0 XEC @@ -1875,7 +1875,7 @@
,

0 XEC

= @@ -2220,16 +2220,16 @@ } >
Advanced
@@ -2291,10 +2291,10 @@
Sign Message
@@ -2353,10 +2353,10 @@
Verify Message
@@ -2421,10 +2421,10 @@ exports[`Without wallet defined 1`] = ` Array [ ,

0 XEC

= @@ -2818,16 +2818,16 @@ } >
Advanced
@@ -2889,10 +2889,10 @@
Sign Message
@@ -2951,10 +2951,10 @@
Verify Message
diff --git a/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap b/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap --- a/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap +++ b/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap @@ -4,10 +4,10 @@ exports[`Wallet with BCH balances and tokens and state field 1`] = `
TBS @@ -32,7 +32,7 @@ } >
@@ -222,7 +222,7 @@ } >
@@ -135,7 +135,7 @@
@@ -173,7 +173,7 @@
@@ -211,7 +211,7 @@
@@ -317,7 +317,7 @@
0 @@ -65,17 +65,17 @@
,

Create a Token

You need at least @@ -96,13 +96,13 @@ exports[`Wallet with BCH balances and tokens 1`] = ` Array [

MigrationTestAlpha

@@ -144,10 +144,10 @@
0 @@ -158,17 +158,17 @@
,

Create a Token

You need at least @@ -189,13 +189,13 @@ exports[`Wallet with BCH balances and tokens and state field 1`] = ` Array [

MigrationTestAlpha

@@ -237,10 +237,10 @@
0.06 @@ -251,16 +251,16 @@
,

Create a Token

@@ -311,7 +311,7 @@
@@ -349,7 +349,7 @@
@@ -387,7 +387,7 @@
@@ -425,7 +425,7 @@
@@ -463,7 +463,7 @@
@@ -569,7 +569,7 @@
0 @@ -672,17 +672,17 @@
,