diff --git a/web/cashtab/extension/public/manifest.json b/web/cashtab/extension/public/manifest.json --- a/web/cashtab/extension/public/manifest.json +++ b/web/cashtab/extension/public/manifest.json @@ -3,7 +3,7 @@ "name": "CashTab", "description": "A browser-integrated BCHA wallet from Bitcoin ABC", - "version": "0.0.1", + "version": "0.0.4", "content_scripts": [ { "matches": ["file://*/*", "http://*/*", "https://*/*"], @@ -26,6 +26,5 @@ "128": "bch128.png", "192": "bch192.png", "512": "bch512.png" - }, - "content_security_policy": "script-src 'self' https://unpkg.com/minimal-slp-wallet-web-joey 'sha256-03cee7e881f6cdd32ce620d5787d7e6a0eaef8acc55557bded61dd6ad82ff0e6'; object-src 'self'" + } } diff --git a/web/cashtab/public/manifest.json b/web/cashtab/public/manifest.json --- a/web/cashtab/public/manifest.json +++ b/web/cashtab/public/manifest.json @@ -1,35 +1,31 @@ { - "short_name": "CashTab", + "manifest_version": 2, + "name": "CashTab", - "icons": [ + "description": "A browser-integrated BCHA wallet from Bitcoin ABC", + "version": "0.0.4", + "content_scripts": [ { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "bch48.png", - "type": "image/png", - "sizes": "48x48" - }, - { - "src": "bch128.png", - "type": "image/png", - "sizes": "128x128" - }, - { - "src": "bch192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "bch512.png", - "type": "image/png", - "sizes": "512x512" + "matches": ["file://*/*", "http://*/*", "https://*/*"], + "js": ["contentscript.js"], + "run_at": "document_idle", + "all_frames": true } ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" + "background": { + "scripts": ["background.js"], + "persistent": false + }, + "browser_action": { + "default_popup": "index.html", + "default_title": "CashTab" + }, + "icons": { + "16": "bch16.png", + "48": "bch48.png", + "128": "bch128.png", + "192": "bch192.png", + "512": "bch512.png" + }, + "content_security_policy": "script-src 'self' https://unpkg.com/minimal-slp-wallet-web-joey 'sha256-03cee7e881f6cdd32ce620d5787d7e6a0eaef8acc55557bded61dd6ad82ff0e6'; object-src 'self'" } diff --git a/web/cashtab/src/components/App.css b/web/cashtab/src/components/App.css --- a/web/cashtab/src/components/App.css +++ b/web/cashtab/src/components/App.css @@ -36,6 +36,8 @@ html, body { + min-width: 400px; + min-height: 600px; max-width: 100%; overflow-x: hidden; } @@ -131,6 +133,7 @@ /* .ant-radio-group-solid .ant-radio-button-wrapper { margin-top: 0px; } + .ant-radio-group-solid .ant-radio-button-wrapper-checked { border: none !important; box-shadow: none !important; @@ -152,6 +155,7 @@ /* .ant-radio-group-solid .ant-radio-button-wrapper-checked { background: #ff8d00 !important; } + .ant-radio-group.ant-radio-group-solid.ant-radio-group-small { font-size: 14px !important; font-weight: 600 !important; @@ -233,6 +237,7 @@ border: 1px solid #17171f; border-radius: 0; } + .ant-alert-message { color: #fff; } @@ -309,6 +314,7 @@ /* .ant-radio-button-wrapper { border: none; } + .ant-radio-button-wrapper-checked { border-radius: none !important; } */ 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 @@ -8,15 +8,15 @@ CaretRightOutlined, SettingFilled, } from '@ant-design/icons'; -import Wallet from '@components/Wallet/Wallet'; -import Send from '@components/Send/Send'; -import SendToken from '@components/Send/SendToken'; -import Configure from '@components/Configure/Configure'; -import NotFound from '@components/NotFound'; -import CashTab from '@assets/cashtab.png'; -import ABC from '@assets/bitcoinabclogo.png'; +import Wallet from './Wallet/Wallet'; +import Send from './Send/Send'; +import SendToken from './Send/SendToken'; +import Configure from './Configure/Configure'; +import NotFound from './NotFound'; +import CashTab from '../assets/cashtab.png'; +import PopOut from '../assets/popout.svg'; import './App.css'; -import { WalletContext } from '@utils/context'; +import { WalletContext } from '../utils/context'; import { Route, Redirect, @@ -88,6 +88,14 @@ } `; +const OpenInTabBtn = styled.button` + background: none; + border: none; +`; +const ExtTabImg = styled.img` + max-width: 20px; +`; + export const WalletBody = styled.div` display: flex; align-items: center; @@ -102,7 +110,8 @@ width: 500px; background-color: #fff; min-height: 100vh; - padding: 10px 30px 120px 30px; + padding-top: 30px; + padding: 10px 30px 100px 30px; background: #fff; -webkit-box-shadow: 0px 0px 24px 1px rgba(0, 0, 0, 1); -moz-box-shadow: 0px 0px 24px 1px rgba(0, 0, 0, 1); @@ -124,12 +133,15 @@ margin-bottom: 20px; justify-content: space-between; border-bottom: 1px solid #e2e2e2; + a { color: #848484; + :hover { color: #ff8d00; } } + @media (max-width: 768px) { a { font-size: 12px; @@ -158,6 +170,9 @@ const history = useHistory(); const selectedKey = location && location.pathname ? location.pathname.substr(1) : ''; + const openInTab = () => { + window.open(`index.html#/${selectedKey}`); + }; return (
@@ -165,13 +180,12 @@ - openInTab()} > - - + +