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 @@ -32,19 +32,19 @@ // Extension-only import used for open in new tab link import PopOut from '@assets/popout.svg'; -const GlobalStyle = createGlobalStyle` +const GlobalStyle = createGlobalStyle` .ant-modal-wrap > div > div.ant-modal-content > div > div > div.ant-modal-confirm-btns > button, .ant-modal > button, .ant-modal-confirm-btns > button, .ant-modal-footer > button { border-radius: 8px; background-color: ${props => props.theme.modals.buttons.background}; color: ${props => props.theme.wallet.text.secondary}; font-weight: bold; - } - + } + .ant-modal-wrap > div > div.ant-modal-content > div > div > div.ant-modal-confirm-btns > button:hover,.ant-modal-confirm-btns > button:hover, .ant-modal-footer > button:hover { color: ${props => props.theme.primary}; transition: color 0.3s; background-color: ${props => props.theme.modals.buttons.background}; - } + } .selectedCurrencyOption { text-align: left; color: ${props => props.theme.wallet.text.secondary} !important; @@ -117,7 +117,7 @@ } ${({ active, ...props }) => active && - ` + ` color: ${props.theme.primary}; .anticon { color: ${props.theme.primary}; @@ -287,7 +287,7 @@ onClick={() => history.push('/tokens')} > - Tokens + eTokens div > div.ant-modal-content > div > div > div.ant-modal-confirm-btns > button, .ant-modal > button, .ant-modal-confirm-btns > button, .ant-modal-footer > button { border-radius: 8px; background-color: ${props => props.theme.modals.buttons.background}; color: ${props => props.theme.wallet.text.secondary}; font-weight: bold; - } - + } + .ant-modal-wrap > div > div.ant-modal-content > div > div > div.ant-modal-confirm-btns > button:hover,.ant-modal-confirm-btns > button:hover, .ant-modal-footer > button:hover { color: ${props => props.theme.primary}; transition: color 0.3s; background-color: ${props => props.theme.modals.buttons.background}; - } + } .selectedCurrencyOption { text-align: left; color: ${props => props.theme.wallet.text.secondary} !important; @@ -120,7 +120,7 @@ } ${({ active, ...props }) => active && - ` + ` color: ${props.theme.primary}; .anticon { color: ${props.theme.primary}; @@ -352,7 +352,7 @@ onClick={() => history.push('/tokens')} > - Tokens + eTokens - +
-  Create Token +  Create eToken diff --git a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap --- a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap +++ b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap @@ -40,7 +40,7 @@ /> - Create Token + Create eToken diff --git a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap --- a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap +++ b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP @generated +// Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Wallet with BCH balances 1`] = ` Array [ @@ -55,7 +55,7 @@ /> - Create Token + Create eToken , @@ -135,7 +135,7 @@ /> - Create Token + Create eToken , @@ -216,7 +216,7 @@ /> - Create Token + Create eToken , @@ -313,7 +313,7 @@ /> - Create Token + Create eToken , @@ -393,7 +393,7 @@ /> - Create Token + Create eToken , diff --git a/web/cashtab/src/components/Wallet/Wallet.js b/web/cashtab/src/components/Wallet/Wallet.js --- a/web/cashtab/src/components/Wallet/Wallet.js +++ b/web/cashtab/src/components/Wallet/Wallet.js @@ -36,7 +36,7 @@ ${({ active, ...props }) => active && - ` + ` color: ${props.theme.primary}; `} `; @@ -61,7 +61,7 @@ export const TabPane = styled.div` ${({ active }) => !active && - ` + ` display: none; `} `; @@ -274,7 +274,7 @@ active={activeTab === 'tokens'} onClick={() => setActiveTab('tokens')} > - Tokens + eTokens