replace colors, change button styling
|
@ -42,7 +42,8 @@
|
|||
}
|
||||
],
|
||||
"react/require-default-props": 0,
|
||||
"react/no-array-index-key": 0
|
||||
"react/no-array-index-key": 0,
|
||||
"react/jsx-props-no-spreading": 0
|
||||
},
|
||||
"env": {
|
||||
"jest/globals": true,
|
||||
|
|
32
package.json
|
@ -31,14 +31,14 @@
|
|||
"dependencies": {
|
||||
"@gnosis.pm/safe-contracts": "^1.0.0",
|
||||
"@gnosis.pm/util-contracts": "2.0.1",
|
||||
"@material-ui/core": "4.3.2",
|
||||
"@material-ui/core": "4.3.3",
|
||||
"@material-ui/icons": "4.2.1",
|
||||
"@testing-library/jest-dom": "^4.0.0",
|
||||
"@testing-library/jest-dom": "4.1.0",
|
||||
"@welldone-software/why-did-you-render": "3.3.3",
|
||||
"axios": "0.19.0",
|
||||
"bignumber.js": "9.0.0",
|
||||
"connected-react-router": "6.5.2",
|
||||
"date-fns": "1.30.1",
|
||||
"date-fns": "2.0.1",
|
||||
"ethereum-ens": "^0.7.7",
|
||||
"final-form": "4.18.5",
|
||||
"history": "^4.7.2",
|
||||
|
@ -51,10 +51,10 @@
|
|||
"react-dom": "16.9.0",
|
||||
"react-final-form": "6.3.0",
|
||||
"react-final-form-listeners": "^1.0.2",
|
||||
"react-hot-loader": "4.12.11",
|
||||
"react-hot-loader": "4.12.12",
|
||||
"react-infinite-scroll-component": "4.5.3",
|
||||
"react-qr-reader": "^2.2.1",
|
||||
"react-redux": "7.1.0",
|
||||
"react-redux": "7.1.1",
|
||||
"react-router-dom": "^5.0.1",
|
||||
"recompose": "^0.30.0",
|
||||
"redux": "4.0.4",
|
||||
|
@ -93,11 +93,11 @@
|
|||
"@storybook/addon-knobs": "5.1.11",
|
||||
"@storybook/addon-links": "5.1.11",
|
||||
"@storybook/react": "5.1.11",
|
||||
"@testing-library/react": "9.1.1",
|
||||
"@testing-library/react": "9.1.3",
|
||||
"autoprefixer": "9.6.1",
|
||||
"babel-core": "^7.0.0-bridge.0",
|
||||
"babel-eslint": "10.0.2",
|
||||
"babel-jest": "24.8.0",
|
||||
"babel-eslint": "10.0.3",
|
||||
"babel-jest": "24.9.0",
|
||||
"babel-loader": "8.0.6",
|
||||
"babel-plugin-dynamic-import-node": "^2.2.0",
|
||||
"babel-plugin-transform-es3-member-expression-literals": "^6.22.0",
|
||||
|
@ -109,17 +109,17 @@
|
|||
"eslint-config-airbnb": "18.0.1",
|
||||
"eslint-plugin-flowtype": "4.2.0",
|
||||
"eslint-plugin-import": "2.18.2",
|
||||
"eslint-plugin-jest": "22.15.1",
|
||||
"eslint-plugin-jest": "22.15.2",
|
||||
"eslint-plugin-jsx-a11y": "6.2.3",
|
||||
"eslint-plugin-react": "7.14.3",
|
||||
"ethereumjs-abi": "0.6.8",
|
||||
"extract-text-webpack-plugin": "^4.0.0-beta.0",
|
||||
"file-loader": "4.2.0",
|
||||
"flow-bin": "0.105.2",
|
||||
"flow-bin": "0.106.2",
|
||||
"fs-extra": "8.1.0",
|
||||
"html-loader": "^0.5.5",
|
||||
"html-webpack-plugin": "^3.0.4",
|
||||
"jest": "24.8.0",
|
||||
"jest": "24.9.0",
|
||||
"jest-dom": "4.0.0",
|
||||
"json-loader": "^0.5.7",
|
||||
"mini-css-extract-plugin": "0.8.0",
|
||||
|
@ -132,13 +132,13 @@
|
|||
"storybook-host": "5.1.0",
|
||||
"storybook-router": "^0.3.3",
|
||||
"style-loader": "1.0.0",
|
||||
"truffle": "5.0.31",
|
||||
"truffle-contract": "4.0.28",
|
||||
"truffle-solidity-loader": "0.1.30",
|
||||
"truffle": "5.0.33",
|
||||
"truffle-contract": "4.0.30",
|
||||
"truffle-solidity-loader": "0.1.32",
|
||||
"uglifyjs-webpack-plugin": "2.2.0",
|
||||
"webpack": "4.39.2",
|
||||
"webpack": "4.39.3",
|
||||
"webpack-bundle-analyzer": "3.4.1",
|
||||
"webpack-cli": "3.3.6",
|
||||
"webpack-cli": "3.3.7",
|
||||
"webpack-dev-server": "3.8.0",
|
||||
"webpack-manifest-plugin": "^2.0.0-rc.2"
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<title>Group</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Icon-/-QR-Icon" transform="translate(-11.000000, -11.000000)" fill="#a2a8ba">
|
||||
<g id="Icon-/-QR-Icon" transform="translate(-11.000000, -11.000000)" fill="#B2B5B2">
|
||||
<g id="QR-Icon" transform="translate(2.000000, 2.000000)">
|
||||
<g id="Group" transform="translate(9.000000, 9.000000)">
|
||||
<path d="M2,2 L2,4 L4,4 L4,2 L2,2 Z M6,0 L6,6 L0,6 L0,0 L6,0 Z" id="Rectangle" fill-rule="nonzero"></path>
|
||||
|
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
@ -1 +1 @@
|
|||
<svg height="15" viewBox="0 0 12 15" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m703.53289 23.5644311.452749 9.0623595c0 1.0249793.847907 1.8557283 1.894311 1.8557283h6.257594c1.046419 0 1.894311-.8307646 1.894311-1.8557283l.435591-9.0623595zm11.464047-.6426824c.001838-.382297.003063-.4080344.003063-.4337561 0-.9961836-.589984-1.5432721-1.381539-1.5432721l-2.203756.0024506c0-.5232018-.510952-.9471711-1.033543-.9471711h-2.743441c-.523202 0-1.050701.4239536-1.050701.9471711l-2.205481-.0024506c-.874256 0-1.381539.6665691-1.381539 1.5432721 0 .0257311.000613.0514638.003063.4337561h11.994636zm-4.101047 3.0240279c0-.2891812.234036-.5232019.52259-.5232019.289181 0 .523202.2340364.523202.5232019v5.9923776c0 .2891811-.234036.5232018-.523202.5232018-.288554 0-.52259-.2340363-.52259-.5232018zm-2.418783 0c0-.2891812.234036-.5232019.523202-.5232019.288554 0 .52259.2340364.52259.5232019v5.9923776c0 .2891811-.234036.5232018-.52259.5232018-.289181 0-.523202-.2340363-.523202-.5232018zm-2.417528 0c0-.2891812.234648-.5232019.523201-.5232019.289182 0 .523202.2340364.523202.5232019v5.9923776c0 .2891811-.234036.5232018-.523202.5232018-.288553 0-.523201-.2340363-.523201-.5232018z" fill="#a2a8ba" transform="translate(-703 -20)"/></svg>
|
||||
<svg height="15" viewBox="0 0 12 15" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m703.53289 23.5644311.452749 9.0623595c0 1.0249793.847907 1.8557283 1.894311 1.8557283h6.257594c1.046419 0 1.894311-.8307646 1.894311-1.8557283l.435591-9.0623595zm11.464047-.6426824c.001838-.382297.003063-.4080344.003063-.4337561 0-.9961836-.589984-1.5432721-1.381539-1.5432721l-2.203756.0024506c0-.5232018-.510952-.9471711-1.033543-.9471711h-2.743441c-.523202 0-1.050701.4239536-1.050701.9471711l-2.205481-.0024506c-.874256 0-1.381539.6665691-1.381539 1.5432721 0 .0257311.000613.0514638.003063.4337561h11.994636zm-4.101047 3.0240279c0-.2891812.234036-.5232019.52259-.5232019.289181 0 .523202.2340364.523202.5232019v5.9923776c0 .2891811-.234036.5232018-.523202.5232018-.288554 0-.52259-.2340363-.52259-.5232018zm-2.418783 0c0-.2891812.234036-.5232019.523202-.5232019.288554 0 .52259.2340364.52259.5232019v5.9923776c0 .2891811-.234036.5232018-.52259.5232018-.289181 0-.523202-.2340363-.523202-.5232018zm-2.417528 0c0-.2891812.234648-.5232019.523201-.5232019.289182 0 .523202.2340364.523202.5232019v5.9923776c0 .2891811-.234036.5232018-.523202.5232018-.288553 0-.523201-.2340363-.523201-.5232018z" fill="#B2B5B2" transform="translate(-703 -20)"/></svg>
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
@ -1 +1 @@
|
|||
<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a" fill="#fff"><path d="m6.72043466.05975844h-6.62356495v11.84970376h6.62356495z" fill="#fff" fill-rule="evenodd"/></mask><g fill="#4a5579" fill-rule="evenodd"><path d="m4.14977665 6.07551536-1.71737342-1.70732942c-.154797.20785847-.24831026.46589514-.24831026.74441596 0 .67391239.54853704 1.22126772 1.22091168 1.22126772.27926965 0 .53821724-.09336958.744772-.25835426"/><path d="m1.87126776 2.19027617c1.03982725-1.02106347 2.40224018-1.57576779 3.8633547-1.57576779h.00917804c.01609919 0 .03219839.00091234.04814712.00121646v5.5467391zm3.85282252-2.13062417c-1.69583171 0-3.2740039.69414069-4.43103929 1.93158142l-.18657008.19904275 4.68546671 4.75589009v.85273625l-.01850655.01870302-1.20548342-1.2283173c-.55925885.37618928-1.27484536.48551834-1.95071051.24739691-1.13777654-.41618029-1.72637503-1.67445284-1.31411535-2.81366468.05852884-.17821093.14669825-.3371106.24449708-.48536628l-.51938702-.5253573-.09794929.16847927c-.5392477.89211904-.83339649 1.92230593-.83339649 2.98260013-.00947896 3.16111517 2.53900808 5.74578182 5.66631374 5.74578182l.95722485.0003041v-11.84889785z" mask="url(#a)" transform="translate(.218409)"/><path d="m11.7375061 6.11561396c0-2.64879063-2.15538824-4.8037754-4.80500459-4.80515818v.57492892c2.33248021.00122914 4.22991669 1.89824874 4.22991669 4.23022926 0 2.33136596-1.89743648 4.22869284-4.22991669 4.22992194v.574929c2.64961635-.0013828 4.80500459-2.15636759 4.80500459-4.80485094"/><path d="m8.02004901 6.01820975-.22912891 1.40770636h1.1220214l-.2288201-1.40770636c.25522242-.12241582.43247309-.37950419.43247309-.67820486 0-.41582039-.34214937-.75340965-.76443209-.75340965-.42197392 0-.76443209.33758926-.76443209.75340965-.00046319.2990033.17647867.55578904.4323187.67820486"/><path d="m7.75184322 2.83111882c.28114484.0716844.38948776-.34809944.1084868-.42035731-.28100096-.07197114-.38934388.34809944-.1084868.42035731"/><path d="m8.97850178 3.44035856c.21945107.18400118.4955759-.14470408.27612484-.3285634-.21945107-.18371744-.49543387.14484596-.27612484.3285634"/><path d="m9.79686881 4.68163059c.12643597.25912811.51314779.0686432.38671179-.19048491-.1261512-.25841307-.51314776-.06821418-.38671179.19048491"/><path d="m7.75184322 9.3998634c.28114484-.07200813.38948776.34827835.1084868.42028648s-.38934388-.34799147-.1084868-.42028648"/><path d="m8.97850178 8.5721264c.21945107-.18396063.4955759.14481403.27612484.32849098-.21945107.18396062-.49543387-.14481403-.27612484-.32849098"/><path d="m9.79686881 7.54913594c.12643597-.25888516.51314779-.06847377.38671179.19069729-.1261512.25831336-.51314776.06818787-.38671179-.19069729"/><path d="m10.208641 6.11535204c0 .29135677.4368186.29135677.4368186 0 0-.29106802-.4368186-.29106802-.4368186 0"/></g></svg>
|
||||
<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a" fill="#fff"><path d="m6.72043466.05975844h-6.62356495v11.84970376h6.62356495z" fill="#fff" fill-rule="evenodd"/></mask><g fill="#001428" fill-rule="evenodd"><path d="m4.14977665 6.07551536-1.71737342-1.70732942c-.154797.20785847-.24831026.46589514-.24831026.74441596 0 .67391239.54853704 1.22126772 1.22091168 1.22126772.27926965 0 .53821724-.09336958.744772-.25835426"/><path d="m1.87126776 2.19027617c1.03982725-1.02106347 2.40224018-1.57576779 3.8633547-1.57576779h.00917804c.01609919 0 .03219839.00091234.04814712.00121646v5.5467391zm3.85282252-2.13062417c-1.69583171 0-3.2740039.69414069-4.43103929 1.93158142l-.18657008.19904275 4.68546671 4.75589009v.85273625l-.01850655.01870302-1.20548342-1.2283173c-.55925885.37618928-1.27484536.48551834-1.95071051.24739691-1.13777654-.41618029-1.72637503-1.67445284-1.31411535-2.81366468.05852884-.17821093.14669825-.3371106.24449708-.48536628l-.51938702-.5253573-.09794929.16847927c-.5392477.89211904-.83339649 1.92230593-.83339649 2.98260013-.00947896 3.16111517 2.53900808 5.74578182 5.66631374 5.74578182l.95722485.0003041v-11.84889785z" mask="url(#a)" transform="translate(.218409)"/><path d="m11.7375061 6.11561396c0-2.64879063-2.15538824-4.8037754-4.80500459-4.80515818v.57492892c2.33248021.00122914 4.22991669 1.89824874 4.22991669 4.23022926 0 2.33136596-1.89743648 4.22869284-4.22991669 4.22992194v.574929c2.64961635-.0013828 4.80500459-2.15636759 4.80500459-4.80485094"/><path d="m8.02004901 6.01820975-.22912891 1.40770636h1.1220214l-.2288201-1.40770636c.25522242-.12241582.43247309-.37950419.43247309-.67820486 0-.41582039-.34214937-.75340965-.76443209-.75340965-.42197392 0-.76443209.33758926-.76443209.75340965-.00046319.2990033.17647867.55578904.4323187.67820486"/><path d="m7.75184322 2.83111882c.28114484.0716844.38948776-.34809944.1084868-.42035731-.28100096-.07197114-.38934388.34809944-.1084868.42035731"/><path d="m8.97850178 3.44035856c.21945107.18400118.4955759-.14470408.27612484-.3285634-.21945107-.18371744-.49543387.14484596-.27612484.3285634"/><path d="m9.79686881 4.68163059c.12643597.25912811.51314779.0686432.38671179-.19048491-.1261512-.25841307-.51314776-.06821418-.38671179.19048491"/><path d="m7.75184322 9.3998634c.28114484-.07200813.38948776.34827835.1084868.42028648s-.38934388-.34799147-.1084868-.42028648"/><path d="m8.97850178 8.5721264c.21945107-.18396063.4955759.14481403.27612484.32849098-.21945107.18396062-.49543387-.14481403-.27612484-.32849098"/><path d="m9.79686881 7.54913594c.12643597-.25888516.51314779-.06847377.38671179.19069729-.1261512.25831336-.51314776.06818787-.38671179-.19069729"/><path d="m10.208641 6.11535204c0 .29135677.4368186.29135677.4368186 0 0-.29106802-.4368186-.29106802-.4368186 0"/></g></svg>
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
@ -1,22 +1,47 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="31" viewBox="0 0 90 31">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="114px" height="34px" viewBox="0 0 114 34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
|
||||
<title>Logo / Nav</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs>
|
||||
<path id="a" d="M17.361.154H.251v30.612h17.11V.154z"/>
|
||||
<polygon id="path-1" points="0 0.0209037037 33.7708575 0.0209037037 33.7708575 33.8740741 0 33.8740741"></polygon>
|
||||
<polygon id="path-3" points="0 33.9790963 113.266883 33.9790963 113.266883 0.125925926 0 0.125925926"></polygon>
|
||||
</defs>
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<path fill="#28B2FA" d="M10.72 15.695l-4.436-4.41a3.215 3.215 0 0 0-.642 1.923 3.159 3.159 0 0 0 3.154 3.154c.722 0 1.39-.24 1.924-.667"/>
|
||||
<g transform="translate(.564)">
|
||||
<mask id="b" fill="#fff">
|
||||
<use xlink:href="#a"/>
|
||||
</mask>
|
||||
<path fill="#28B2FA" d="M4.834 5.658c2.686-2.638 6.206-4.07 9.98-4.07h.024c.042 0 .083.002.125.003V15.92L4.834 5.658zM14.787.154c-4.38 0-8.458 1.793-11.447 4.99l-.482.514 12.105 12.286v2.203l-.048.048-3.114-3.173a5.636 5.636 0 0 1-5.04.64 5.684 5.684 0 0 1-3.395-7.27c.152-.46.38-.87.632-1.253L2.656 7.782l-.253.435A14.9 14.9 0 0 0 .25 15.922c-.024 8.166 6.56 14.843 14.638 14.843l2.473.001V.156L14.787.154z" mask="url(#b)"/>
|
||||
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Nav-/-Connected" transform="translate(-16.000000, -8.000000)">
|
||||
<g id="Logo-/-Nav" transform="translate(16.000000, 8.000000)">
|
||||
<g id="Group-27" transform="translate(-0.000000, 0.000000)">
|
||||
<g id="Group-3" transform="translate(0.000000, 0.105022)">
|
||||
<mask id="mask-2" fill="white">
|
||||
<use xlink:href="#path-1"></use>
|
||||
</mask>
|
||||
<g id="Clip-2"></g>
|
||||
<path d="M29.2437699,17.8711556 L25.7610856,17.8711556 L21.408484,17.8711556 C20.9747187,20.0657926 19.0438162,21.7204593 16.7271352,21.7204593 C14.0912542,21.7204593 11.9544608,19.5785852 11.9544608,16.9361556 C11.9544608,14.2939778 14.0912542,12.1519778 16.7271352,12.1519778 C19.1154195,12.1519778 21.0940575,13.9105333 21.4445369,16.2062889 L25.7610856,16.2062889 L29.2437699,16.2062889 C29.7024079,16.2062889 30.074117,16.5790296 30.074117,17.0387852 C30.074117,17.4984148 29.7024079,17.8711556 29.2437699,17.8711556 M16.8854162,0.0209037037 C7.55990215,0.0209037037 -2.51239669e-05,7.59925185 -2.51239669e-05,16.9474889 C-2.51239669e-05,26.2957259 7.55990215,33.8740741 16.8854162,33.8740741 C26.2109302,33.8740741 33.7708575,26.2957259 33.7708575,16.9474889 C33.7708575,7.59925185 26.2109302,0.0209037037 16.8854162,0.0209037037" id="Fill-1" fill="#001428" mask="url(#mask-2)"></path>
|
||||
</g>
|
||||
<path d="M37.2874843,13.6086259 C37.2874843,10.5884185 39.2325818,8.2427963 42.5525884,8.2427963 C44.0590215,8.2427963 45.6969785,8.87318148 46.7646215,10.1046111 L45.0388562,11.5706407 C44.483114,11.0282778 43.6641983,10.5444704 42.5525884,10.5444704 C41.0754248,10.5444704 39.8469884,11.6733963 39.8469884,13.6086259 C39.8469884,15.2946481 40.885362,16.6726556 42.6550942,16.6726556 C43.298519,16.6726556 43.8542612,16.5406852 44.4539702,16.2181889 L44.4539702,14.9866333 L42.4355107,14.9866333 L42.4355107,12.9635074 L46.7938909,12.9635074 L46.7938909,17.6403963 C45.8432,18.3734111 44.2637818,18.9159 42.6550942,18.9159 C39.6568,18.9159 37.2874843,16.9952778 37.2874843,13.6086259" id="Fill-4" fill="#001428"></path>
|
||||
<path d="M48.2830261,11.6293474 L50.5645336,11.6293474 L50.5645336,12.4649919 L50.593803,12.4649919 C51.1495451,11.8199993 51.9100476,11.497377 52.7437864,11.497377 C54.2209501,11.497377 55.303165,12.2303919 55.303165,14.5028511 L55.303165,18.7985622 L53.0216575,18.7985622 L53.0216575,15.0599474 C53.0216575,13.8724659 52.6267088,13.5352363 51.8809038,13.5352363 C51.0911319,13.5352363 50.5645336,14.0777252 50.5645336,15.1919178 L50.5645336,18.7985622 L48.2830261,18.7985622 L48.2830261,11.6293474 Z" id="Fill-6" fill="#001428"></path>
|
||||
<path d="M61.662154,15.2213089 C61.662154,14.2243533 61.0040317,13.5351607 60.1118797,13.5351607 C59.1904582,13.5351607 58.5469078,14.2389607 58.5469078,15.2213089 C58.5469078,16.1741904 59.2050301,16.9073311 60.1118797,16.9073311 C60.9746367,16.9073311 61.662154,16.2035311 61.662154,15.2213089 M56.2362565,15.2213089 C56.2362565,13.0367459 57.8011028,11.4974274 60.1118797,11.4974274 C62.3641177,11.4974274 63.9729309,13.0075311 63.9729309,15.2213089 C63.9729309,17.4203533 62.3641177,18.930457 60.1118797,18.930457 C57.8011028,18.930457 56.2362565,17.3910126 56.2362565,15.2213089" id="Fill-8" fill="#001428"></path>
|
||||
<path d="M64.3678797,17.8748578 L65.435397,16.3940948 C66.0349805,16.9365837 66.6493871,17.2005244 67.3073838,17.2005244 C67.7608714,17.2005244 67.9949012,17.0392133 67.9949012,16.7753985 C67.9949012,16.5406726 67.7754433,16.3940948 66.8832912,16.1155467 C65.6841243,15.7491022 64.6310532,15.1626652 64.6310532,13.7845319 C64.6310532,12.3331096 65.8156483,11.4973393 67.3073838,11.4973393 C68.3898499,11.4973393 69.1794962,11.7758874 70.0131094,12.3916652 L68.9308945,13.9896652 C68.4335656,13.4912504 67.8194102,13.242043 67.3367788,13.242043 C67.0734797,13.242043 66.7663392,13.3594059 66.7663392,13.6379541 C66.7663392,13.8578207 67.0295127,14.0191319 67.7462995,14.2682133 C69.3258433,14.8108281 70.188726,15.2213467 70.188726,16.6286948 C70.188726,17.96288 69.238035,18.9304948 67.27824,18.9304948 C66.1520582,18.9304948 65.157526,18.5786578 64.3678797,17.8748578" id="Fill-10" fill="#001428"></path>
|
||||
<mask id="mask-4" fill="white">
|
||||
<use xlink:href="#path-3"></use>
|
||||
</mask>
|
||||
<g id="Clip-13"></g>
|
||||
<path d="M71.1859967,18.7986 L73.4675041,18.7986 L73.4675041,11.6293852 L71.1859967,11.6293852 L71.1859967,18.7986 Z M70.9666645,9.41560741 C70.9666645,8.71180741 71.5369785,8.12537037 72.3267504,8.12537037 C73.1165223,8.12537037 73.7015339,8.6972 73.7015339,9.41560741 C73.7015339,10.1632296 73.1165223,10.7350593 72.3267504,10.7350593 C71.5369785,10.7350593 70.9666645,10.1632296 70.9666645,9.41560741 L70.9666645,9.41560741 Z" id="Fill-12" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M74.3288919,17.8748578 L75.3964093,16.3940948 C75.9959927,16.9365837 76.6103993,17.2005244 77.268396,17.2005244 C77.7218836,17.2005244 77.9559134,17.0392133 77.9559134,16.7753985 C77.9559134,16.5406726 77.7364555,16.3940948 76.8443035,16.1155467 C75.6451365,15.7491022 74.5920655,15.1626652 74.5920655,13.7845319 C74.5920655,12.3331096 75.7766605,11.4973393 77.268396,11.4973393 C78.3508621,11.4973393 79.1405084,11.7758874 79.9741217,12.3916652 L78.8919068,13.9896652 C78.3945779,13.4912504 77.7804225,13.242043 77.2977911,13.242043 C77.0344919,13.242043 76.7273514,13.3594059 76.7273514,13.6379541 C76.7273514,13.8578207 76.990525,14.0191319 77.7073117,14.2682133 C79.2868555,14.8108281 80.1497382,15.2213467 80.1497382,16.6286948 C80.1497382,17.96288 79.1990473,18.9304948 77.2392522,18.9304948 C76.1130704,18.9304948 75.1185382,18.5786578 74.3288919,17.8748578" id="Fill-14" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M84.3469607,17.2737504 L85.780283,15.5291726 C86.5699293,16.3941578 87.5207458,16.7607281 88.2372813,16.7607281 C89.0563226,16.7607281 89.4073045,16.3500837 89.4073045,15.8808837 C89.4073045,15.30918 89.0416251,15.0599726 87.8717276,14.6640615 C86.2920582,14.1216985 84.71264,13.3739504 84.71264,11.3213578 C84.71264,9.59151333 86.1898036,8.28666889 88.1203293,8.25732815 C89.4804152,8.22798741 90.7236747,8.75574296 91.7180813,9.60612074 L90.3432979,11.3947726 C89.4511458,10.6910985 88.807721,10.4125504 88.2227094,10.4125504 C87.6230003,10.4125504 87.2574466,10.7203133 87.2574466,11.2188541 C87.2427491,11.7172689 87.6230003,11.9812096 88.7491821,12.4210689 C90.5773276,13.124743 91.9812549,13.593817 91.9812549,15.6024615 C91.9812549,18.0508393 89.8899359,18.9304319 88.1641706,18.9304319 C86.8332284,18.9304319 85.4585706,18.4172837 84.3469607,17.2737504" id="Fill-15" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M98.0932502,15.2213089 C98.0932502,14.2389607 97.4352536,13.5205533 96.5869428,13.5205533 C95.7093626,13.5205533 95.0512403,14.1950126 95.0512403,15.2213089 C95.0512403,16.2328719 95.6800932,16.9073311 96.5869428,16.9073311 C97.4058585,16.9073311 98.0932502,16.2474793 98.0932502,15.2213089 M92.725766,15.2213089 C92.725766,13.0221385 94.1443907,11.4974274 95.9872337,11.4974274 C96.7477362,11.4974274 97.4643974,11.8053163 97.9616007,12.3916274 L97.9909957,12.37702 L97.9909957,11.6293978 L100.287075,11.6293978 L100.287075,18.7984867 L98.1079478,18.7984867 L98.1079478,18.0508644 L98.0786783,18.036257 C97.6106188,18.6373015 96.967194,18.930457 96.1043114,18.930457 C94.1443907,18.930457 92.725766,17.4350867 92.725766,15.2213089" id="Fill-16" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M101.967592,13.4766681 L101.280075,13.4766681 L101.280075,11.6293348 L101.967592,11.6293348 L101.967592,10.5004089 C101.967592,8.72649037 102.888888,7.86150519 104.32221,7.86150519 C105.272901,7.86150519 106.004134,8.24280889 106.252736,8.41860148 L105.828518,10.075283 C105.521503,9.91397185 105.141252,9.81146815 104.936491,9.81146815 C104.526971,9.81146815 104.263671,10.0166015 104.263671,10.5883052 L104.263671,11.6293348 L105.623757,11.6293348 L105.623757,13.4766681 L104.263671,13.4766681 L104.263671,18.7985496 L101.967592,18.7985496 L101.967592,13.4766681 Z" id="Fill-17" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M108.367458,14.4588652 L111.043914,14.4588652 C110.897693,13.7551911 110.429633,13.3153319 109.742116,13.3153319 C109.040152,13.3153319 108.513679,13.7405837 108.367458,14.4588652 M113.222916,15.8223911 L108.35276,15.8223911 C108.499107,16.6434281 109.186499,17.0685541 110.063954,17.0685541 C110.648965,17.0538207 111.248674,16.8339541 111.73118,16.2915911 L113.04755,17.6403837 C112.447841,18.3880059 111.453309,18.9304948 109.83005,18.9304948 C107.665369,18.9304948 106.08595,17.4351244 106.08595,15.2064874 C106.08595,13.0367837 107.60683,11.4973393 109.771511,11.4973393 C111.789719,11.4973393 113.266883,13.0075689 113.266883,15.1331985 C113.266883,15.3384578 113.237739,15.6756874 113.222916,15.8223911" id="Fill-18" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M38.1357825,27.3460993 L37.2728998,27.3460993 L37.2728998,26.319803 L38.1357825,26.319803 L38.1357825,24.8683807 C38.1357825,23.3436696 38.8670155,22.5665807 40.1394188,22.5665807 C40.85608,22.5665807 41.3972502,22.7865733 41.7920734,23.0357807 L41.5288998,24.0474696 C41.0754122,23.8127437 40.6805891,23.6661659 40.2856403,23.6661659 C39.7006288,23.6661659 39.3205031,24.0474696 39.3205031,24.9857437 L39.3205031,26.319803 L41.3387114,26.319803 L41.3387114,27.3460993 L39.3205031,27.3460993 L39.3205031,33.459677 L38.1357825,33.459677 L38.1357825,27.3460993 Z" id="Fill-19" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M47.9302102,29.8970941 C47.9302102,28.372383 46.8479954,27.3167459 45.4730863,27.3167459 C43.9813507,27.3167459 43.001516,28.4750126 43.001516,29.8970941 C43.001516,31.3191756 43.9960483,32.4627089 45.4730863,32.4627089 C46.8332979,32.4627089 47.9302102,31.4218052 47.9302102,29.8970941 M41.7876516,29.8970941 C41.7876516,27.8445015 43.2646896,26.2318941 45.4730863,26.2318941 C47.5791028,26.2318941 49.1440747,27.7272644 49.1440747,29.8970941 C49.1440747,32.0667978 47.5791028,33.5475607 45.4730863,33.5475607 C43.2646896,33.5475607 41.7876516,31.9495607 41.7876516,29.8970941" id="Fill-20" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M50.6490631,26.3197652 L51.8336582,26.3197652 L51.8336582,27.6246096 L51.8629276,27.6246096 C52.3747028,26.7596244 53.1938698,26.2318689 54.1737045,26.2318689 C54.2760846,26.2318689 54.3637673,26.2318689 54.4662731,26.2464763 L54.4662731,27.5659281 C54.2906565,27.5513207 54.1151656,27.5367133 53.9982136,27.5367133 C52.638002,27.5367133 51.8336582,28.577617 51.8336582,30.0144319 L51.8336582,33.4596393 L50.6490631,33.4596393 L50.6490631,26.3197652 Z" id="Fill-21" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<polygon id="Fill-22" fill="#001428" mask="url(#mask-4)" points="62.2175068 24.2086548 59.116958 24.2086548 59.116958 23.0505141 66.6343002 23.0505141 66.6343002 24.2086548 63.4899101 24.2086548 63.4899101 33.459677 62.2175068 33.459677"></polygon>
|
||||
<path d="M67.4080304,29.2813541 L71.7811081,29.2813541 C71.6054916,28.10848 70.8449891,27.3166578 69.674966,27.3166578 C68.5342122,27.3166578 67.6273626,28.0645319 67.4080304,29.2813541 M72.9364337,30.2489689 L67.3788866,30.2489689 C67.53968,31.5830281 68.4756734,32.4627467 69.8211874,32.4627467 C70.7718783,32.4627467 71.4446982,32.0522281 71.8833626,31.5097393 L72.7171015,32.2134133 C72.1026949,33.0051096 71.2106684,33.5475985 69.7773461,33.5475985 C67.6713296,33.5475985 66.179594,32.081443 66.179594,29.8971319 C66.179594,27.7419096 67.6566321,26.2318059 69.6895379,26.2318059 C71.6346354,26.2318059 72.9655775,27.7271763 72.9655775,29.7651615 C72.9655775,29.9556874 72.9364337,30.1609467 72.9364337,30.2489689" id="Fill-23" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M80.015036,29.9411178 C80.015036,28.4749622 79.0350757,27.3166956 77.6310228,27.3166956 C76.2856344,27.3166956 75.188722,28.3577252 75.188722,29.9411178 C75.188722,31.3778067 76.1685567,32.4626585 77.6310228,32.4626585 C78.9473931,32.4626585 80.015036,31.4510956 80.015036,29.9411178 M73.9894294,29.9411178 C73.9894294,27.8298437 75.4373236,26.2318437 77.4555319,26.2318437 C78.508603,26.2318437 79.4300245,26.7303844 79.9419253,27.5952437 L79.9710691,27.5806363 L79.9710691,26.31974 L81.1557898,26.31974 L81.1557898,33.4596141 L80.015036,33.4596141 L80.015036,32.169503 L80.0004641,32.169503 C79.4885633,33.0197548 78.6109831,33.5476363 77.4555319,33.5476363 C75.4957369,33.5476363 73.9894294,32.1108215 73.9894294,29.9411178" id="Fill-24" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M83.0307663,26.3197652 L84.2153613,26.3197652 L84.2153613,27.6100022 L84.2300588,27.6100022 C84.7711035,26.745017 85.6632555,26.2318689 86.6138208,26.2318689 C87.6814638,26.2318689 88.4566638,26.7742319 88.8223431,27.75658 L88.836915,27.75658 C89.3780853,26.7889652 90.3433481,26.2318689 91.454958,26.2318689 C93.0343762,26.2318689 93.9118307,27.3167207 93.9118307,29.3547059 L93.9118307,33.4596393 L92.7272357,33.4596393 L92.7272357,29.6772022 C92.7272357,28.1524911 92.1861911,27.3167207 91.1038506,27.3167207 C89.9923663,27.3167207 89.1000886,28.3136763 89.1000886,29.9116763 L89.1000886,33.4596393 L87.9156192,33.4596393 L87.9156192,29.6772022 C87.9156192,28.1524911 87.3306076,27.3167207 86.262839,27.3167207 C85.0928159,27.3167207 84.2153613,28.3136763 84.2153613,29.9116763 L84.2153613,33.4596393 L83.0307663,33.4596393 L83.0307663,26.3197652 Z" id="Fill-25" fill="#001428" mask="url(#mask-4)"></path>
|
||||
<path d="M95.1318631,32.5359978 L95.7314466,31.6270644 C96.2873144,32.1695533 96.9161673,32.4920496 97.9106995,32.4920496 C98.7735821,32.4920496 99.2707855,32.0667978 99.2707855,31.5244348 C99.2707855,30.8940496 98.6126631,30.7180052 97.5742896,30.3368274 C96.4188383,29.9263089 95.4390036,29.4572348 95.4390036,28.1523904 C95.4390036,27.0528052 96.4335359,26.2317681 97.7790499,26.2317681 C98.6419326,26.2317681 99.446402,26.4664941 100.236174,27.1114867 L99.6217673,28.0497607 C99.0076119,27.478057 98.349364,27.2874052 97.7352086,27.2874052 C97.1794664,27.2874052 96.6382962,27.6100274 96.6382962,28.1523904 C96.6382962,28.7094867 97.2086102,28.9880348 97.9838102,29.266583 C99.4901177,29.85302 100.48465,30.1169607 100.470078,31.5098274 C100.470078,32.62402 99.6217673,33.5475607 97.9106995,33.5475607 C96.7259788,33.5475607 95.8192549,33.1370422 95.1318631,32.5359978" id="Fill-26" fill="#001428" mask="url(#mask-4)"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<path fill="#28B2FA" d="M30.322 15.799c0-6.843-5.568-12.41-12.413-12.414v1.486c6.026.003 10.927 4.903 10.927 10.928 0 6.022-4.901 10.924-10.927 10.927v1.485c6.845-.003 12.413-5.57 12.413-12.412"/>
|
||||
<path fill="#28B2FA" d="M20.718 15.547l-.591 3.637h2.898l-.591-3.637a1.947 1.947 0 0 0 1.117-1.752c0-1.074-.884-1.946-1.975-1.946-1.09 0-1.974.872-1.974 1.946a1.941 1.941 0 0 0 1.116 1.752M20.026 7.314c.726.185 1.006-.9.28-1.086-.726-.186-1.006.9-.28 1.086M23.194 8.888c.567.475 1.28-.374.714-.85-.567-.474-1.28.375-.714.85M25.309 12.094c.326.67 1.325.178.999-.492-.326-.667-1.326-.176-1 .492M20.026 24.283c.726-.186 1.006.9.28 1.086-.726.186-1.006-.9-.28-1.086M23.194 22.145c.567-.476 1.28.374.714.848-.567.475-1.28-.374-.714-.848M25.309 19.502c.326-.669 1.325-.177.999.493-.326.667-1.326.176-1-.493M26.372 15.798c0 .753 1.129.753 1.129 0 0-.752-1.129-.752-1.129 0"/>
|
||||
<g fill="#28B2FA">
|
||||
<path d="M44.805 11.465c-.318-.27-.709-.5-1.172-.695-.463-.191-.99-.365-1.581-.52a34.85 34.85 0 0 1-1.247-.347c-.33-.1-.589-.201-.778-.315-.19-.109-.321-.233-.394-.37a1.026 1.026 0 0 1-.108-.488v-.033c0-.286.125-.527.376-.719.251-.193.628-.29 1.13-.29.502 0 1.005.103 1.507.307a8.455 8.455 0 0 1 1.538.834l1.34-1.917a6.922 6.922 0 0 0-1.983-1.09 7.116 7.116 0 0 0-2.37-.38c-.602 0-1.153.081-1.653.248-.5.164-.93.401-1.291.71-.36.307-.64.676-.84 1.1-.199.423-.298.9-.298 1.428v.033c0 .575.091 1.052.276 1.439.183.385.443.707.778.965.335.26.741.477 1.221.654.48.176 1.016.336 1.608.479.49.121.889.238 1.196.347.307.111.547.22.72.33.172.11.29.23.352.356.06.127.09.273.09.44v.031c0 .343-.147.608-.443.802-.295.192-.71.289-1.246.289-.67 0-1.287-.128-1.85-.38a7.641 7.641 0 0 1-1.648-1.025l-1.523 1.8a6.964 6.964 0 0 0 2.343 1.398 7.87 7.87 0 0 0 2.629.455c.635 0 1.214-.081 1.737-.24a3.997 3.997 0 0 0 1.35-.694 3.16 3.16 0 0 0 .88-1.124c.21-.446.316-.955.316-1.53v-.032c0-.506-.082-.942-.242-1.305a2.657 2.657 0 0 0-.72-.951M66.26 17.341h2.483v-4.606h5.387v-2.38h-5.387V7.821h6.111v-2.38H66.26zM82.338 15.013v-2.498h5.404v-2.33h-5.404V7.77h6.141V5.44h-8.63v11.9h8.711v-2.328zM56.773 12.667h-2.184l.658-2.41A1.153 1.153 0 0 1 54.59 9.2c0-.635.488-1.15 1.093-1.15.603 0 1.09.515 1.09 1.15 0 .473-.27.879-.657 1.055l.658 2.41zm.047-7.225h-2.277l-4.81 11.9h2.518l1.026-2.65h4.747l1.026 2.65h2.583l-4.813-11.9z"/>
|
||||
</g>
|
||||
<text fill="#4A5579" font-family="Montserrat-Regular, Montserrat" font-size="7" letter-spacing=".3">
|
||||
<tspan x="35.725" y="27.412">TEAM EDITIO</tspan> <tspan x="84.903" y="27.412">N</tspan>
|
||||
</text>
|
||||
</g>
|
||||
</svg>
|
||||
</svg>
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 15 KiB |
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="7" height="13" viewBox="0 0 7 13">
|
||||
<path fill="#A2A8BA" fill-rule="evenodd" d="M1.878 6.22l-.995 6.115h4.874l-.994-6.116c1.109-.531 1.879-1.648 1.879-2.946C6.642 1.467 5.155 0 3.32 0 1.488 0 0 1.467 0 3.273-.002 4.572.767 5.688 1.878 6.22"/>
|
||||
<path fill="#B2B5B2" fill-rule="evenodd" d="M1.878 6.22l-.995 6.115h4.874l-.994-6.116c1.109-.531 1.879-1.648 1.879-2.946C6.642 1.467 5.155 0 3.32 0 1.488 0 0 1.467 0 3.273-.002 4.572.767 5.688 1.878 6.22"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 300 B After Width: | Height: | Size: 300 B |
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
|
||||
<path fill="#4A5579" fill-rule="evenodd" d="M.658 0L0 1.936l.43 2.053-.278.216.404.313-.308.238.41.368-.26.175.595.686-.881 2.78.83 2.798 2.975-.777 1.58 1.231h1.976l1.72-1.26 2.866.806.83-2.798h.003l-.885-2.78.594-.686-.26-.174.41-.368-.307-.239.404-.313-.278-.217.43-2.052L12.341 0 8.197 1.522H4.804L.658 0zm7.427 6.826l1.693.796-2.369.683.676-1.48zm-4.863.794l1.693-.794.676 1.479-2.37-.685zm2.276 2.274l.294-.17h1.416l.277.178.093 1.033H5.401l.097-1.041z"/>
|
||||
<path fill="#001428" fill-rule="evenodd" d="M.658 0L0 1.936l.43 2.053-.278.216.404.313-.308.238.41.368-.26.175.595.686-.881 2.78.83 2.798 2.975-.777 1.58 1.231h1.976l1.72-1.26 2.866.806.83-2.798h.003l-.885-2.78.594-.686-.26-.174.41-.368-.307-.239.404-.313-.278-.217.43-2.052L12.341 0 8.197 1.522H4.804L.658 0zm7.427 6.826l1.693.796-2.369.683.676-1.48zm-4.863.794l1.693-.794.676 1.479-2.37-.685zm2.276 2.274l.294-.17h1.416l.277.178.093 1.033H5.401l.097-1.041z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 557 B After Width: | Height: | Size: 557 B |
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="11" viewBox="0 0 13 11">
|
||||
<path fill="#A2A8BA" fill-rule="nonzero" d="M6.947 6.947H5.79V4.632h1.158v2.315zm0 2.316H5.79V8.105h1.158v1.158zM0 11h12.737L6.368 0 0 11z"/>
|
||||
<path fill="#B2B5B2" fill-rule="nonzero" d="M6.947 6.947H5.79V4.632h1.158v2.315zm0 2.316H5.79V8.105h1.158v1.158zM0 11h12.737L6.368 0 0 11z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 237 B After Width: | Height: | Size: 237 B |
|
@ -47,7 +47,7 @@ const styles = () => ({
|
|||
const Layout = openHoc(({
|
||||
open, toggle, clickAway, classes, providerInfo, providerDetails,
|
||||
}: Props) => (
|
||||
<React.Fragment>
|
||||
<>
|
||||
<Row className={classes.summary}>
|
||||
<Col start="xs" middle="xs" className={classes.logo}>
|
||||
<Link to="/">
|
||||
|
@ -58,7 +58,7 @@ const Layout = openHoc(({
|
|||
<Spacer />
|
||||
<Divider />
|
||||
<Provider open={open} toggle={toggle} info={providerInfo}>
|
||||
{providerRef => (
|
||||
{(providerRef) => (
|
||||
<Popper open={open} anchorEl={providerRef.current} placement="bottom-end">
|
||||
{({ TransitionProps }) => (
|
||||
<Grow {...TransitionProps}>
|
||||
|
@ -73,7 +73,7 @@ const Layout = openHoc(({
|
|||
)}
|
||||
</Provider>
|
||||
</Row>
|
||||
</React.Fragment>
|
||||
</>
|
||||
))
|
||||
|
||||
export default withStyles(styles)(Layout)
|
||||
|
|
|
@ -109,7 +109,7 @@ const UserDetails = ({
|
|||
const color = connected ? 'primary' : 'warning'
|
||||
|
||||
return (
|
||||
<React.Fragment>
|
||||
<>
|
||||
<Block className={classes.container}>
|
||||
<Row className={classes.identicon} margin="md" align="center">
|
||||
{connected ? (
|
||||
|
@ -148,8 +148,7 @@ const UserDetails = ({
|
|||
<Spacer />
|
||||
{provider === 'safe'
|
||||
? <Img className={classes.logo} src={safeIcon} height={14} alt="Safe client" />
|
||||
: <Img className={classes.logo} src={metamaskIcon} height={14} alt="Metamask client" />
|
||||
}
|
||||
: <Img className={classes.logo} src={metamaskIcon} height={14} alt="Metamask client" />}
|
||||
<Paragraph noMargin align="right" weight="bolder" className={classes.labels}>
|
||||
{upperFirst(provider)}
|
||||
</Paragraph>
|
||||
|
@ -173,7 +172,7 @@ const UserDetails = ({
|
|||
</Paragraph>
|
||||
</Button>
|
||||
</Row>
|
||||
</React.Fragment>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
// @flow
|
||||
import * as React from 'react'
|
||||
import { withStyles } from '@material-ui/core/styles'
|
||||
import Dot from '@material-ui/icons/FiberManualRecord'
|
||||
import Paragraph from '~/components/layout/Paragraph'
|
||||
import Col from '~/components/layout/Col'
|
||||
import Dot from '@material-ui/icons/FiberManualRecord'
|
||||
import { connected as connectedBg, sm } from '~/theme/variables'
|
||||
import Identicon from '~/components/Identicon'
|
||||
import { shortVersionOf } from '~/logic/wallets/ethAddresses'
|
||||
|
@ -53,12 +53,12 @@ const ProviderInfo = ({
|
|||
const identiconAddress = userAddress || 'random'
|
||||
|
||||
return (
|
||||
<React.Fragment>
|
||||
<>
|
||||
{connected && (
|
||||
<React.Fragment>
|
||||
<>
|
||||
<Identicon address={identiconAddress} diameter={30} />
|
||||
<Dot className={classes.logo} />
|
||||
</React.Fragment>
|
||||
</>
|
||||
)}
|
||||
{!connected && <CircleDot keySize={14} circleSize={35} dotSize={16} dotTop={24} dotRight={11} mode="warning" />}
|
||||
<Col start="sm" layout="column" className={classes.account}>
|
||||
|
@ -69,7 +69,7 @@ const ProviderInfo = ({
|
|||
{cutAddress}
|
||||
</Paragraph>
|
||||
</Col>
|
||||
</React.Fragment>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ import { logComponentStack, type Info } from '~/utils/logBoundaries'
|
|||
import { SharedSnackbarConsumer, type Variant } from '~/components/SharedSnackBar'
|
||||
import { WALLET_ERROR_MSG } from '~/logic/wallets/store/actions'
|
||||
import { getProviderInfo } from '~/logic/wallets/getWeb3'
|
||||
import type { ProviderProps } from '~/logic/wallets/store/model/provider'
|
||||
import ProviderAccesible from './component/ProviderInfo/ProviderAccesible'
|
||||
import UserDetails from './component/ProviderDetails/UserDetails'
|
||||
import ProviderDisconnected from './component/ProviderInfo/ProviderDisconnected'
|
||||
|
@ -23,8 +24,14 @@ type State = {
|
|||
}
|
||||
|
||||
class HeaderComponent extends React.PureComponent<Props, State> {
|
||||
state = {
|
||||
hasError: false,
|
||||
providerListener: ?IntervalID
|
||||
|
||||
constructor(props) {
|
||||
super(props)
|
||||
|
||||
this.state = {
|
||||
hasError: false,
|
||||
}
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
|
|
|
@ -10,7 +10,9 @@ import IconButton from '@material-ui/core/IconButton'
|
|||
import { withStyles } from '@material-ui/core/styles'
|
||||
import WarningIcon from '@material-ui/icons/Warning'
|
||||
import { type WithStyles } from '~/theme/mui'
|
||||
import { secondary, warning, connected } from '~/theme/variables'
|
||||
import {
|
||||
secondary, warning, connected, error,
|
||||
} from '~/theme/variables'
|
||||
|
||||
type Variant = 'success' | 'error' | 'warning' | 'info'
|
||||
|
||||
|
@ -34,7 +36,7 @@ const variantIcon = {
|
|||
info: InfoIcon,
|
||||
}
|
||||
|
||||
const styles = theme => ({
|
||||
const styles = (theme) => ({
|
||||
success: {
|
||||
backgroundColor: '#ffffff',
|
||||
},
|
||||
|
@ -51,7 +53,7 @@ const styles = theme => ({
|
|||
backgroundColor: '#ffe6ea',
|
||||
},
|
||||
errorIcon: {
|
||||
color: '#fd7890',
|
||||
color: error,
|
||||
},
|
||||
info: {
|
||||
backgroundColor: '#ffffff',
|
||||
|
@ -73,13 +75,7 @@ const styles = theme => ({
|
|||
})
|
||||
|
||||
const Close = ({ classes, onClose }: CloseProps) => (
|
||||
<IconButton
|
||||
key="close"
|
||||
aria-label="Close"
|
||||
color="inherit"
|
||||
className={classes.close}
|
||||
onClick={onClose}
|
||||
>
|
||||
<IconButton key="close" aria-label="Close" color="inherit" className={classes.close} onClick={onClose}>
|
||||
<CloseIcon className={classes.icon} />
|
||||
</IconButton>
|
||||
)
|
||||
|
|
|
@ -5,21 +5,19 @@ import Button from '@material-ui/core/Button'
|
|||
type Props = {
|
||||
minWidth?: number,
|
||||
minHeight?: number,
|
||||
rounded?: boolean,
|
||||
testId?: string,
|
||||
style?: Object,
|
||||
}
|
||||
|
||||
const calculateStyleBased = (minWidth, minHeight, rounded) => ({
|
||||
const calculateStyleBased = (minWidth, minHeight) => ({
|
||||
minWidth: minWidth && `${minWidth}px`,
|
||||
minHeight: minHeight && `${minHeight}px`,
|
||||
borderRadius: rounded ? '4px' : 0,
|
||||
})
|
||||
|
||||
const GnoButton = ({
|
||||
minWidth, minHeight = 27, testId = '', rounded, style = {}, ...props
|
||||
minWidth, minHeight = 27, testId = '', style = {}, ...props
|
||||
}: Props) => {
|
||||
const calculatedStyle = calculateStyleBased(minWidth, minHeight, rounded)
|
||||
const calculatedStyle = calculateStyleBased(minWidth, minHeight)
|
||||
|
||||
return <Button style={{ ...calculatedStyle, ...style }} data-testid={testId} {...props} />
|
||||
}
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="111" height="91" viewBox="0 0 111 91">
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<g fill="#A2A8BA">
|
||||
<g fill="#B2B5B2">
|
||||
<path d="M6.535 81.666h9.8V78.4h-9.8v3.266zm64.131-6.535h-67.4V3.266H94.73l.003 47.754c.203-.004.403-.015.608-.015.898 0 1.785.051 2.659.144V0H0v78.4h3.265v6.535H19.6V78.4h51.202c-.097-.888-.15-1.79-.15-2.705 0-.189.01-.376.014-.564z"/>
|
||||
<path d="M9.8 68.582L9.816 9.8l78.385.015v4.885h-1.635a1.64 1.64 0 0 0-1.635 1.634c0 .9.736 1.635 1.635 1.635H88.2v1.634h-1.635a1.64 1.64 0 0 0-1.635 1.635c0 .9.736 1.635 1.635 1.635H88.2v29.184c1.06-.32 2.15-.572 3.266-.748V22.866c.899 0 1.634-.736 1.634-1.634 0-.9-.735-1.635-1.634-1.635v-1.635a1.64 1.64 0 0 0 1.634-1.635c0-.9-.735-1.635-1.634-1.635V9.816a3.284 3.284 0 0 0-3.281-3.285H9.816a3.283 3.283 0 0 0-3.281 3.285v58.766a3.283 3.283 0 0 0 3.28 3.284H70.95c.173-1.114.423-2.2.74-3.26L9.8 68.582z"/>
|
||||
<path d="M60.435 42.466A3.276 3.276 0 0 1 57.17 39.2a3.276 3.276 0 0 1 3.265-3.266 3.277 3.277 0 0 1 3.266 3.266 3.276 3.276 0 0 1-3.266 3.265m0-9.8a6.533 6.533 0 0 0-6.535 6.535 6.534 6.534 0 0 0 6.535 6.535 6.535 6.535 0 0 0 0-13.069"/>
|
||||
<path d="M75.136 40.832h1.55a16.242 16.242 0 0 1-3.61 8.689l-1.095-1.095a1.633 1.633 0 0 0-2.305 0 1.634 1.634 0 0 0 0 2.305l1.095 1.095a16.303 16.303 0 0 1-8.69 3.61l.004-1.535c0-.9-.735-1.635-1.634-1.635-.9 0-1.635.736-1.635 1.635v1.55a16.249 16.249 0 0 1-8.69-3.61l1.095-1.095a1.631 1.631 0 0 0 0-2.304 1.63 1.63 0 0 0-2.305 0l-1.095 1.095a16.303 16.303 0 0 1-3.61-8.69l1.524.004c.9 0 1.634-.735 1.634-1.635s-.734-1.634-1.634-1.634h-1.55a16.25 16.25 0 0 1 3.61-8.69l1.095 1.094c.325.325.734.475 1.16.475.424 0 .834-.165 1.159-.475a1.63 1.63 0 0 0 0-2.305l-1.095-1.095a16.309 16.309 0 0 1 8.69-3.61l-.003 1.524c0 .9.734 1.635 1.634 1.635.9 0 1.635-.734 1.635-1.635v-1.55a16.254 16.254 0 0 1 8.69 3.61l-1.095 1.095a1.63 1.63 0 0 0 0 2.304c.326.326.735.475 1.16.475a1.67 1.67 0 0 0 1.16-.475l1.095-1.094a16.3 16.3 0 0 1 3.61 8.69l-1.554-.004c-.9 0-1.635.734-1.635 1.634a1.65 1.65 0 0 0 1.635 1.647M74.3 25.347c-.015-.016-.035-.016-.05-.035-3.56-3.525-8.426-5.71-13.816-5.71-5.39 0-10.256 2.189-13.8 5.7-.016.014-.035.014-.05.033-.016.015-.016.034-.035.05-3.53 3.557-5.715 8.426-5.715 13.816 0 5.39 2.19 10.256 5.7 13.8.015.016.015.034.034.05.016.015.035.015.05.034 3.557 3.526 8.426 5.716 13.816 5.716 5.39 0 10.256-2.19 13.8-5.7.016-.016.035-.016.051-.035.015-.015.015-.034.034-.049 3.525-3.56 5.716-8.427 5.716-13.816 0-5.39-2.19-10.26-5.701-13.804-.015-.016-.015-.035-.034-.05M17.966 22.862c-.9 0-1.635.735-1.635 1.634v32.666c0 .9.734 1.635 1.635 1.635.899 0 1.634-.735 1.634-1.635v-1.634c.9 0 1.635-.736 1.635-1.635 0-.9-.735-1.635-1.635-1.635V29.4c.9 0 1.635-.734 1.635-1.634 0-.9-.735-1.635-1.635-1.635v-1.635c0-.898-.735-1.634-1.634-1.634M26.135 22.866c-.9 0-1.635.735-1.635 1.634v1.636c-.9 0-1.635.734-1.635 1.634 0 .9.736 1.634 1.635 1.634V52.27c-.9 0-1.635.735-1.635 1.634 0 .9.736 1.636 1.635 1.636v1.634c0 .9.735 1.635 1.635 1.635s1.634-.735 1.634-1.635L27.765 24.5c0-.899-.734-1.634-1.63-1.634"/>
|
||||
</g>
|
||||
<path stroke="#467EE5" stroke-width="3" d="M93.756 58.266c-8.466 0-15.361 6.896-15.361 15.362 0 8.466 6.895 15.36 15.361 15.36 8.466 0 15.361-6.894 15.361-15.36s-6.895-15.362-15.361-15.362z"/>
|
||||
<path fill="#467EE5" fill-rule="nonzero" d="M93.68 68.471h-3.06v10.313h8.39v-3.06h-5.33z"/>
|
||||
<path stroke="#008C73" stroke-width="3" d="M93.756 58.266c-8.466 0-15.361 6.896-15.361 15.362 0 8.466 6.895 15.36 15.361 15.36 8.466 0 15.361-6.894 15.361-15.36s-6.895-15.362-15.361-15.362z"/>
|
||||
<path fill="#008C73" fill-rule="nonzero" d="M93.68 68.471h-3.06v10.313h8.39v-3.06h-5.33z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
@ -10,7 +10,7 @@ import Bold from '~/components/layout/Bold'
|
|||
import Block from '~/components/layout/Block'
|
||||
import Identicon from '~/components/Identicon'
|
||||
import { copyToClipboard } from '~/utils/clipboard'
|
||||
import { secondary, xs } from '~/theme/variables'
|
||||
import { secondary, xs, border } from '~/theme/variables'
|
||||
|
||||
const openIconStyle = {
|
||||
height: '16px',
|
||||
|
@ -22,7 +22,7 @@ const styles = () => ({
|
|||
fontSize: '12px',
|
||||
lineHeight: 1.08,
|
||||
letterSpacing: -0.5,
|
||||
backgroundColor: '#eae9ef',
|
||||
backgroundColor: border,
|
||||
width: 'fit-content',
|
||||
padding: '6px',
|
||||
marginTop: xs,
|
||||
|
|
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="21" viewBox="0 0 13 21">
|
||||
<path fill="#A2A8BA" fill-rule="evenodd" d="M8.7 11.266V0H4.27v11.266H0l6.484 9.172 6.493-9.172z"/>
|
||||
<path fill="#B2B5B2" fill-rule="evenodd" d="M8.7 11.266V0H4.27v11.266H0l6.484 9.172 6.493-9.172z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 195 B After Width: | Height: | Size: 195 B |
|
@ -8,7 +8,7 @@ export const styles = () => ({
|
|||
minHeight: '48px',
|
||||
},
|
||||
search: {
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
paddingLeft: sm,
|
||||
},
|
||||
padding: {
|
||||
|
|
|
@ -1 +1 @@
|
|||
<svg height="26" viewBox="0 0 26 26" width="26" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="nonzero"><circle cx="13" cy="13" fill="#eae9ef" r="13"/><path d="m12.9800266 4.09134443c-.0615216.00319594-.1222455.01997459-.1765755.04953761-.05433.02956221-.1014704.07190818-.1374265.12224554l-6.1059363 8.59150972c-.04873785.0687133-.07590285.1526054-.07590285.2373076 0 .0838943.027165.1685862.07590285.2373076l6.1059363 8.5898734c.0375515.0527326.0878889.096678.1462136.1262403.0575269.0295622.1222455.0455429.1877618.0455429.0647186 0 .1302349-.0159797.1877618-.0455429.057527-.0295623.1078623-.0735077.1462136-.1262403l6.1059363-8.5898734c.0487379-.0687132.0759028-.1526054.0759028-.2373076 0-.0838942-.0271649-.1685862-.0759028-.2373076l-6.1073681-8.59150972c-.039151-.05592949-.093481-.10067268-.1542049-.13103259-.0615217-.02956221-.1302349-.04394343-.1981484-.04074851zm.0191757 1.7729551 2.2890102 6.81773647h-4.5774068zm-1.2160533 1.05305516-1.93513509 5.76476311h-2.16199071zm2.4330066 0 4.0971462 5.76476311h-2.1619907zm-6.53015285 6.58292421h2.16117254l1.93513511 5.7631268zm3.02494615 0h4.5774068l-2.2890102 6.8161001zm5.4403622 0h2.1611726l-4.0963281 5.7631268z" fill="#a2a8ba"/></g></svg>
|
||||
<svg height="26" viewBox="0 0 26 26" width="26" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="nonzero"><circle cx="13" cy="13" fill="#E8E7E6" r="13"/><path d="m12.9800266 4.09134443c-.0615216.00319594-.1222455.01997459-.1765755.04953761-.05433.02956221-.1014704.07190818-.1374265.12224554l-6.1059363 8.59150972c-.04873785.0687133-.07590285.1526054-.07590285.2373076 0 .0838943.027165.1685862.07590285.2373076l6.1059363 8.5898734c.0375515.0527326.0878889.096678.1462136.1262403.0575269.0295622.1222455.0455429.1877618.0455429.0647186 0 .1302349-.0159797.1877618-.0455429.057527-.0295623.1078623-.0735077.1462136-.1262403l6.1059363-8.5898734c.0487379-.0687132.0759028-.1526054.0759028-.2373076 0-.0838942-.0271649-.1685862-.0759028-.2373076l-6.1073681-8.59150972c-.039151-.05592949-.093481-.10067268-.1542049-.13103259-.0615217-.02956221-.1302349-.04394343-.1981484-.04074851zm.0191757 1.7729551 2.2890102 6.81773647h-4.5774068zm-1.2160533 1.05305516-1.93513509 5.76476311h-2.16199071zm2.4330066 0 4.0971462 5.76476311h-2.1619907zm-6.53015285 6.58292421h2.16117254l1.93513511 5.7631268zm3.02494615 0h4.5774068l-2.2890102 6.8161001zm5.4403622 0h2.1611726l-4.0963281 5.7631268z" fill="#B2B5B2"/></g></svg>
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
@ -51,14 +51,17 @@ type Props = {
|
|||
type Action = 'Token' | 'Send' | 'Receive'
|
||||
|
||||
class Balances extends React.Component<Props, State> {
|
||||
state = {
|
||||
hideZero: false,
|
||||
showToken: false,
|
||||
sendFunds: {
|
||||
isOpen: false,
|
||||
selectedToken: undefined,
|
||||
},
|
||||
showReceive: false,
|
||||
constructor(props) {
|
||||
super(props)
|
||||
this.state = {
|
||||
hideZero: false,
|
||||
showToken: false,
|
||||
sendFunds: {
|
||||
isOpen: false,
|
||||
selectedToken: undefined,
|
||||
},
|
||||
showReceive: false,
|
||||
}
|
||||
}
|
||||
|
||||
onShow = (action: Action) => () => {
|
||||
|
@ -110,7 +113,7 @@ class Balances extends React.Component<Props, State> {
|
|||
} = this.props
|
||||
|
||||
const columns = generateColumns()
|
||||
const autoColumns = columns.filter(c => !c.custom)
|
||||
const autoColumns = columns.filter((c) => !c.custom)
|
||||
const checkboxClasses = {
|
||||
root: classes.root,
|
||||
}
|
||||
|
@ -118,7 +121,7 @@ class Balances extends React.Component<Props, State> {
|
|||
const filteredData = filterByZero(getBalanceData(activeTokens), hideZero)
|
||||
|
||||
return (
|
||||
<React.Fragment>
|
||||
<>
|
||||
<Row align="center" className={classes.message}>
|
||||
<Col xs={6}>
|
||||
<Checkbox
|
||||
|
@ -171,7 +174,6 @@ class Balances extends React.Component<Props, State> {
|
|||
color="primary"
|
||||
className={classes.send}
|
||||
onClick={() => this.showSendFunds(row.asset.name)}
|
||||
rounded
|
||||
testId="balance-send-btn"
|
||||
>
|
||||
<CallMade className={classNames(classes.leftIcon, classes.iconSmall)} />
|
||||
|
@ -184,7 +186,6 @@ class Balances extends React.Component<Props, State> {
|
|||
color="primary"
|
||||
className={classes.receive}
|
||||
onClick={this.onShow('Receive')}
|
||||
rounded
|
||||
>
|
||||
<CallReceived className={classNames(classes.leftIcon, classes.iconSmall)} />
|
||||
Receive
|
||||
|
@ -192,8 +193,7 @@ class Balances extends React.Component<Props, State> {
|
|||
</Row>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))
|
||||
}
|
||||
))}
|
||||
</Table>
|
||||
<SendModal
|
||||
onClose={this.hideSendFunds}
|
||||
|
@ -219,7 +219,7 @@ class Balances extends React.Component<Props, State> {
|
|||
onClose={this.onHide('Receive')}
|
||||
/>
|
||||
</Modal>
|
||||
</React.Fragment>
|
||||
</>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -70,7 +70,7 @@ const styles = () => ({
|
|||
fontSize: smallFontSize,
|
||||
letterSpacing: '0.5px',
|
||||
color: '#ffffff',
|
||||
backgroundColor: '#a2a8ba',
|
||||
backgroundColor: '#B2B5B2',
|
||||
fontFamily: 'Roboto Mono, monospace',
|
||||
textTransform: 'uppercase',
|
||||
padding: `0 ${sm}`,
|
||||
|
@ -81,8 +81,11 @@ const styles = () => ({
|
|||
})
|
||||
|
||||
class Layout extends React.Component<Props, State> {
|
||||
state = {
|
||||
tabIndex: 0,
|
||||
constructor(props) {
|
||||
super(props)
|
||||
this.state = {
|
||||
tabIndex: 0,
|
||||
}
|
||||
}
|
||||
|
||||
handleChange = (event, tabIndex) => {
|
||||
|
@ -123,7 +126,7 @@ class Layout extends React.Component<Props, State> {
|
|||
const etherScanLink = getEtherScanLink('address', address, network)
|
||||
|
||||
return (
|
||||
<React.Fragment>
|
||||
<>
|
||||
<Block className={classes.container} margin="xl">
|
||||
<Identicon address={address} diameter={50} />
|
||||
<Block className={classes.name}>
|
||||
|
@ -150,7 +153,7 @@ class Layout extends React.Component<Props, State> {
|
|||
<Tab label="Settings" data-testid={SETTINGS_TAB_BTN_TEST_ID} />
|
||||
</Tabs>
|
||||
</Row>
|
||||
<Hairline color="#c8ced4" />
|
||||
<Hairline color="#d4d53d" />
|
||||
{tabIndex === 0 && (
|
||||
<Balances
|
||||
ethBalance={ethBalance}
|
||||
|
@ -190,7 +193,7 @@ class Layout extends React.Component<Props, State> {
|
|||
createTransaction={createTransaction}
|
||||
/>
|
||||
)}
|
||||
</React.Fragment>
|
||||
</>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// @flow
|
||||
import {
|
||||
lg, md, sm, border, background,
|
||||
lg, sm, border, background,
|
||||
} from '~/theme/variables'
|
||||
|
||||
export const styles = () => ({
|
||||
|
@ -15,7 +15,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -15,7 +15,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// @flow
|
||||
import {
|
||||
lg, md, sm, border, background,
|
||||
lg, sm, border, background,
|
||||
} from '~/theme/variables'
|
||||
|
||||
export const styles = () => ({
|
||||
|
@ -15,7 +15,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
|
||||
<path fill="#4A5579" fill-rule="nonzero" d="M11.684 2.695a.669.669 0 0 0 0-.94L10.141.195a.652.652 0 0 0-.93 0l-1.215 1.22 2.475 2.5 1.213-1.22zM0 9.502v2.5h2.474l7.297-7.38-2.474-2.5L0 9.502z"/>
|
||||
<path fill="#001428" fill-rule="nonzero" d="M11.684 2.695a.669.669 0 0 0 0-.94L10.141.195a.652.652 0 0 0-.93 0l-1.215 1.22 2.475 2.5 1.213-1.22zM0 9.502v2.5h2.474l7.297-7.38-2.474-2.5L0 9.502z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 291 B After Width: | Height: | Size: 291 B |
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="15" height="12" viewBox="0 0 15 12">
|
||||
<path fill="#4A5579" fill-rule="nonzero" d="M12.1 12v-1.412H9.278V9.176h2.824V7.765l2.117 2.117L12.101 12zM5.749 0a2.824 2.824 0 1 1 0 5.647 2.824 2.824 0 0 1 0-5.647zm0 7.059c.812 0 1.588.085 2.287.24a4.265 4.265 0 0 0-.635 3.995H.1V9.882c0-1.56 2.528-2.823 5.648-2.823z"/>
|
||||
<path fill="#001428" fill-rule="nonzero" d="M12.1 12v-1.412H9.278V9.176h2.824V7.765l2.117 2.117L12.101 12zM5.749 0a2.824 2.824 0 1 1 0 5.647 2.824 2.824 0 0 1 0-5.647zm0 7.059c.812 0 1.588.085 2.287.24a4.265 4.265 0 0 0-.635 3.995H.1V9.882c0-1.56 2.528-2.823 5.648-2.823z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 370 B |
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
annotation: {
|
||||
letterSpacing: '-1px',
|
||||
color: '#a2a8ba',
|
||||
color: '#B2B5B2',
|
||||
marginRight: 'auto',
|
||||
marginLeft: '20px',
|
||||
},
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// @flow
|
||||
import {
|
||||
fontColor, lg, smallFontSize, md,
|
||||
fontColor, lg, smallFontSize, md, border,
|
||||
} from '~/theme/variables'
|
||||
|
||||
export const styles = () => ({
|
||||
ownersText: {
|
||||
fontSize: '26px',
|
||||
color: '#8896b6',
|
||||
color: '#B2B5B2',
|
||||
'& b': {
|
||||
color: fontColor,
|
||||
},
|
||||
|
@ -25,7 +25,7 @@ export const styles = () => ({
|
|||
paddingRight: md,
|
||||
display: 'flex',
|
||||
justifyContent: 'flex-end',
|
||||
borderTop: 'solid 1px #e4e8f1',
|
||||
borderTop: `solid 1px ${border}`,
|
||||
boxSizing: 'border-box',
|
||||
},
|
||||
modifyBtn: {
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="10" height="12" viewBox="0 0 10 12">
|
||||
<path fill="#FB4F62" fill-rule="nonzero" d="M.442 2.953l.375 7.51c0 .849.702 1.537 1.57 1.537H7.57c.867 0 1.57-.688 1.57-1.538l.36-7.509H.442zm9.498-.532l.003-.36c0-.825-.489-1.278-1.145-1.278L6.972.785C6.972.35 6.55 0 6.116 0H3.843c-.434 0-.87.351-.87.785L1.144.783C.42.783 0 1.335 0 2.062l.003.359H9.94zM6.542 4.927a.433.433 0 1 1 .867 0v4.965a.433.433 0 1 1-.867 0V4.927zm-2.004 0a.433.433 0 1 1 .867 0v4.965a.433.433 0 1 1-.867 0V4.927zm-2.003 0a.434.434 0 0 1 .867 0v4.965a.433.433 0 1 1-.867 0V4.927z"/>
|
||||
<path fill="#f02525" fill-rule="nonzero" d="M.442 2.953l.375 7.51c0 .849.702 1.537 1.57 1.537H7.57c.867 0 1.57-.688 1.57-1.538l.36-7.509H.442zm9.498-.532l.003-.36c0-.825-.489-1.278-1.145-1.278L6.972.785C6.972.35 6.55 0 6.116 0H3.843c-.434 0-.87.351-.87.785L1.144.783C.42.783 0 1.335 0 2.062l.003.359H9.94zM6.542 4.927a.433.433 0 1 1 .867 0v4.965a.433.433 0 1 1-.867 0V4.927zm-2.004 0a.433.433 0 1 1 .867 0v4.965a.433.433 0 1 1-.867 0V4.927zm-2.003 0a.434.434 0 0 1 .867 0v4.965a.433.433 0 1 1-.867 0V4.927z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 605 B After Width: | Height: | Size: 605 B |
|
@ -1,6 +1,6 @@
|
|||
// @flow
|
||||
import {
|
||||
sm, lg, border, secondary, bolderFont,
|
||||
sm, lg, border, secondary, bolderFont, background,
|
||||
} from '~/theme/variables'
|
||||
|
||||
export const styles = () => ({
|
||||
|
@ -23,7 +23,7 @@ export const styles = () => ({
|
|||
cursor: 'pointer',
|
||||
},
|
||||
active: {
|
||||
backgroundColor: '#f4f4f9',
|
||||
backgroundColor: background,
|
||||
color: secondary,
|
||||
fontWeight: bolderFont,
|
||||
},
|
||||
|
|
|
@ -5,7 +5,7 @@ import EditIcon from '@material-ui/icons/Edit'
|
|||
import BlockIcon from '@material-ui/icons/Block'
|
||||
import Row from '~/components/layout/Row'
|
||||
import Button from '~/components/layout/Button'
|
||||
import { sm, lg } from '~/theme/variables'
|
||||
import { sm, lg, background } from '~/theme/variables'
|
||||
|
||||
export const CONFIRM_TX_BTN_TEST_ID = 'confirm-btn'
|
||||
export const EXECUTE_TX_BTN_TEST_ID = 'execute-btn'
|
||||
|
@ -24,7 +24,7 @@ const styles = () => ({
|
|||
buttonRow: {
|
||||
height: '56px',
|
||||
justifyContent: 'center',
|
||||
backgroundColor: '#f7f8fb',
|
||||
backgroundColor: background,
|
||||
},
|
||||
button: {
|
||||
height: '32px',
|
||||
|
|
|
@ -56,11 +56,11 @@ const OwnersList = ({ owners, classes, executionConfirmation }: ListProps) => (
|
|||
<>
|
||||
<MuiList className={classes.ownersList}>
|
||||
{executionConfirmation && <OwnerComponent owner={executionConfirmation} isExecutor />}
|
||||
{owners.map(owner => (
|
||||
{owners.map((owner) => (
|
||||
<OwnerComponent key={owner.address} owner={owner} />
|
||||
))}
|
||||
</MuiList>
|
||||
<Hairline color="#c8ced4" />
|
||||
<Hairline color="#d4d53d" />
|
||||
</>
|
||||
)
|
||||
|
||||
|
|
|
@ -29,8 +29,7 @@ type Props = {
|
|||
onTxExecute: Function,
|
||||
}
|
||||
|
||||
const isCancellationTransaction = (tx: Transaction, safeAddress: string) =>
|
||||
!tx.value && tx.data === EMPTY_DATA && tx.recipient === safeAddress
|
||||
const isCancellationTransaction = (tx: Transaction, safeAddress: string) => !tx.value && tx.data === EMPTY_DATA && tx.recipient === safeAddress
|
||||
|
||||
const OwnersColumn = ({
|
||||
tx,
|
||||
|
@ -68,7 +67,7 @@ const OwnersColumn = ({
|
|||
}
|
||||
})
|
||||
const ownersUnconfirmed = owners.filter(
|
||||
owner => tx.confirmations.findIndex(conf => conf.owner.address === owner.address) === -1,
|
||||
(owner) => tx.confirmations.findIndex((conf) => conf.owner.address === owner.address) === -1,
|
||||
)
|
||||
|
||||
let displayButtonRow = true
|
||||
|
@ -97,7 +96,7 @@ const OwnersColumn = ({
|
|||
<Tab label={confirmedLabel} />
|
||||
<Tab label={unconfirmedLabel} />
|
||||
</Tabs>
|
||||
<Hairline color="#c8ced4" />
|
||||
<Hairline color="#d4d53d" />
|
||||
</Row>
|
||||
<Row>
|
||||
{tabIndex === 0 && <OwnersList owners={ownersWhoConfirmed} executionConfirmation={executionConfirmation} />}
|
||||
|
|
|
@ -10,7 +10,7 @@ export const styles = () => ({
|
|||
},
|
||||
rightCol: {
|
||||
boxSizing: 'border-box',
|
||||
borderLeft: 'solid 1px #c8ced4',
|
||||
borderLeft: 'solid 1px #d4d53d',
|
||||
},
|
||||
icon: {
|
||||
marginRight: sm,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// @flow
|
||||
import {
|
||||
md, lg, connected, error,
|
||||
md, lg, connected, error, disabled,
|
||||
} from '~/theme/variables'
|
||||
|
||||
export const styles = () => ({
|
||||
|
@ -8,10 +8,10 @@ export const styles = () => ({
|
|||
padding: `${lg} ${md}`,
|
||||
},
|
||||
awaiting_confirmations: {
|
||||
color: '#2e73d9',
|
||||
color: disabled,
|
||||
},
|
||||
awaiting_execution: {
|
||||
color: '#2e73d9',
|
||||
color: disabled,
|
||||
},
|
||||
success: {
|
||||
color: connected,
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="13" viewBox="0 0 14 13">
|
||||
<path fill="#2E73D9" fill-rule="nonzero" d="M2.332 0C1.412 0 .666.746.666 1.666v.333A.666.666 0 0 0 0 2.665V5.33c0 .368.298.666.666.666h3.332a.666.666 0 0 0 .666-.666V2.665A.666.666 0 0 0 3.998 2v-.333C3.998.746 3.252 0 2.332 0zm0 .666a1 1 0 0 1 1 1v.333h-2v-.333a1 1 0 0 1 1-1zm9.434 0a.634.634 0 0 0-.46.187l-1.225 1.232 2.498 2.499 1.226-1.233a.655.655 0 0 0 0-.932L12.246.853a.703.703 0 0 0-.48-.187zM9.368 2.792l-7.37 7.369v2.498h2.5l7.368-7.369-2.498-2.498z"/>
|
||||
<path fill="#5D6D74" fill-rule="nonzero" d="M2.332 0C1.412 0 .666.746.666 1.666v.333A.666.666 0 0 0 0 2.665V5.33c0 .368.298.666.666.666h3.332a.666.666 0 0 0 .666-.666V2.665A.666.666 0 0 0 3.998 2v-.333C3.998.746 3.252 0 2.332 0zm0 .666a1 1 0 0 1 1 1v.333h-2v-.333a1 1 0 0 1 1-1zm9.434 0a.634.634 0 0 0-.46.187l-1.225 1.232 2.498 2.499 1.226-1.233a.655.655 0 0 0 0-.932L12.246.853a.703.703 0 0 0-.48-.187zM9.368 2.792l-7.37 7.369v2.498h2.5l7.368-7.369-2.498-2.498z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 562 B After Width: | Height: | Size: 562 B |
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
|
||||
<path fill="#FD7890" fill-rule="nonzero" d="M7.7 7.7H6.3V3.5h1.4v4.2zm0 2.8H6.3V9.1h1.4v1.4zM7 0a7 7 0 1 0 0 14A7 7 0 0 0 7 0z"/>
|
||||
<path fill="#f02525" fill-rule="nonzero" d="M7.7 7.7H6.3V3.5h1.4v4.2zm0 2.8H6.3V9.1h1.4v1.4zM7 0a7 7 0 1 0 0 14A7 7 0 0 0 7 0z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 225 B |
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
|
||||
<path fill="#346D6D" fill-rule="nonzero" d="M7 0a7 7 0 1 1 0 14A7 7 0 0 1 7 0zm-.913 9.8L11.2 5.139 10.17 4.2 6.087 7.916 3.83 5.865l-1.03.939L6.087 9.8z"/>
|
||||
<path fill="#008C73" fill-rule="nonzero" d="M7 0a7 7 0 1 1 0 14A7 7 0 0 1 7 0zm-.913 9.8L11.2 5.139 10.17 4.2 6.087 7.916 3.83 5.865l-1.03.939L6.087 9.8z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 252 B After Width: | Height: | Size: 252 B |
|
@ -1,5 +1,7 @@
|
|||
// @flow
|
||||
import { smallFontSize, boldFont, sm } from '~/theme/variables'
|
||||
import {
|
||||
smallFontSize, boldFont, sm, error, disabled, primary,
|
||||
} from '~/theme/variables'
|
||||
|
||||
export const styles = () => ({
|
||||
container: {
|
||||
|
@ -12,20 +14,20 @@ export const styles = () => ({
|
|||
boxSizing: 'border-box',
|
||||
},
|
||||
success: {
|
||||
backgroundColor: '#d7f3f3',
|
||||
color: '#346d6d',
|
||||
backgroundColor: '#A1D2CA',
|
||||
color: primary,
|
||||
},
|
||||
cancelled: {
|
||||
backgroundColor: 'transparent',
|
||||
color: '#fd7890',
|
||||
color: error,
|
||||
},
|
||||
awaiting_confirmations: {
|
||||
backgroundColor: '#dfebff',
|
||||
color: '#2e73d9',
|
||||
color: disabled,
|
||||
},
|
||||
awaiting_execution: {
|
||||
backgroundColor: '#dfebff',
|
||||
color: '#2e73d9',
|
||||
color: disabled,
|
||||
},
|
||||
statusText: {
|
||||
marginLeft: 'auto',
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13">
|
||||
<path fill="#65707E" fill-rule="nonzero" d="M1.6 0A1.6 1.6 0 0 0 0 1.6v8.8A1.6 1.6 0 0 0 1.6 12v.8h1.6V12H12v.8h1.6V12a1.6 1.6 0 0 0 1.6-1.6v-.8h.8V8h-.8V4h.8V2.4h-.8v-.8A1.6 1.6 0 0 0 13.6 0h-12zm0 1.6h12v8.8h-12V1.6zm7.6 1.2a3.2 3.2 0 1 0 0 6.4 3.2 3.2 0 0 0 0-6.4zM2.4 4v4H4V4H2.4zm6.8.4a1.6 1.6 0 1 1 0 3.2 1.6 1.6 0 0 1 0-3.2z"/>
|
||||
<path fill="#5D6D74" fill-rule="nonzero" d="M1.6 0A1.6 1.6 0 0 0 0 1.6v8.8A1.6 1.6 0 0 0 1.6 12v.8h1.6V12H12v.8h1.6V12a1.6 1.6 0 0 0 1.6-1.6v-.8h.8V8h-.8V4h.8V2.4h-.8v-.8A1.6 1.6 0 0 0 13.6 0h-12zm0 1.6h12v8.8h-12V1.6zm7.6 1.2a3.2 3.2 0 1 0 0 6.4 3.2 3.2 0 0 0 0-6.4zM2.4 4v4H4V4H2.4zm6.8.4a1.6 1.6 0 1 1 0 3.2 1.6 1.6 0 0 1 0-3.2z"/>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 430 B |
|
@ -13,6 +13,7 @@ import {
|
|||
bolderFont,
|
||||
boldFont,
|
||||
buttonLargeFontSize,
|
||||
border,
|
||||
xs,
|
||||
} from './variables'
|
||||
|
||||
|
@ -53,6 +54,7 @@ export default createMuiTheme({
|
|||
color: disabled,
|
||||
},
|
||||
color: disabled,
|
||||
borderRadius: '8px',
|
||||
},
|
||||
contained: {
|
||||
boxShadow: 'none',
|
||||
|
@ -63,6 +65,9 @@ export default createMuiTheme({
|
|||
containedSecondary: {
|
||||
backgroundColor: error,
|
||||
},
|
||||
outlinedPrimary: {
|
||||
border: `2px solid ${primary}`,
|
||||
},
|
||||
sizeLarge: {
|
||||
padding: `${md} ${lg}`,
|
||||
minHeight: '52px',
|
||||
|
@ -97,7 +102,7 @@ export default createMuiTheme({
|
|||
MuiStepIcon: {
|
||||
root: {
|
||||
fontSize: '22px',
|
||||
color: '#A2A8BA !important',
|
||||
color: '#B2B5B2 !important',
|
||||
},
|
||||
completed: {
|
||||
color: `${secondary} !important`,
|
||||
|
@ -109,7 +114,7 @@ export default createMuiTheme({
|
|||
},
|
||||
MuiStepContent: {
|
||||
root: {
|
||||
borderLeft: '1px solid #A2A8BA',
|
||||
borderLeft: '1px solid #B2B5B2',
|
||||
},
|
||||
},
|
||||
MuiTypography: {
|
||||
|
@ -132,7 +137,7 @@ export default createMuiTheme({
|
|||
color: secondary,
|
||||
order: 0,
|
||||
marginTop: '0px',
|
||||
backgroundColor: '#EAE9EF',
|
||||
backgroundColor: border,
|
||||
zIndex: 1, // for firefox
|
||||
},
|
||||
},
|
||||
|
@ -144,7 +149,7 @@ export default createMuiTheme({
|
|||
lineHeight: '56px',
|
||||
order: 1,
|
||||
padding: `0 ${md}`,
|
||||
backgroundColor: '#EAE9EF',
|
||||
backgroundColor: '#F0EFEE',
|
||||
borderRadius: '5px',
|
||||
'&:$disabled': {
|
||||
color: '#0000ff',
|
||||
|
@ -176,7 +181,7 @@ export default createMuiTheme({
|
|||
MuiStepLabel: {
|
||||
label: {
|
||||
textAlign: 'left',
|
||||
color: '#A2A8BA',
|
||||
color: '#B2B5B2',
|
||||
'&$active': {
|
||||
color: primary,
|
||||
},
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
// @flow
|
||||
const border = '#e4e8f1'
|
||||
const background = '#f4f4f9'
|
||||
const primary = '#4a5579'
|
||||
const secondary = '#467ee5' // '#13222b'
|
||||
const tertiary = '#f6f9fc'
|
||||
const fontColor = '#4a5579'
|
||||
const fancyColor = '#fd7890'
|
||||
const border = '#e8e7e6'
|
||||
const background = '#f7f5f5'
|
||||
const primary = '#001428'
|
||||
const secondary = '#008C73'
|
||||
const fontColor = '#001428'
|
||||
const fancyColor = '#f02525'
|
||||
const warningColor = '#ffc05f'
|
||||
const errorColor = '#fb4f62'
|
||||
const connectedColor = '#00c4c4'
|
||||
const disabled = '#65707e'
|
||||
const errorColor = '#f02525'
|
||||
const connectedColor = '#008C73'
|
||||
const disabled = '#5D6D74'
|
||||
const xs = '4px'
|
||||
const sm = '8px'
|
||||
const md = '16px'
|
||||
|
@ -18,47 +17,43 @@ const xl = '32px'
|
|||
const xxl = '40px'
|
||||
const marginButtonImg = '12px'
|
||||
|
||||
module.exports = Object.assign(
|
||||
{},
|
||||
{
|
||||
primary,
|
||||
secondary,
|
||||
tertiary,
|
||||
disabled,
|
||||
background,
|
||||
fontColor,
|
||||
fancy: fancyColor,
|
||||
warning: warningColor,
|
||||
error: errorColor,
|
||||
connected: connectedColor,
|
||||
xs,
|
||||
sm,
|
||||
md,
|
||||
lg,
|
||||
xl,
|
||||
xxl,
|
||||
border,
|
||||
marginButtonImg,
|
||||
fontSizeHeadingXs: 13,
|
||||
fontSizeHeadingSm: 18,
|
||||
fontSizeHeadingMd: 21,
|
||||
fontSizeHeadingLg: 32,
|
||||
buttonLargeFontSize: '12px',
|
||||
lightFont: 300,
|
||||
regularFont: 400,
|
||||
bolderFont: 500,
|
||||
boldFont: 700,
|
||||
smallFontSize: '11px',
|
||||
mediumFontSize: '13px',
|
||||
largeFontSize: '15px',
|
||||
extraLargeFontSize: '18px',
|
||||
xxlFontSize: '32px',
|
||||
screenXs: 480,
|
||||
screenXsMax: 767,
|
||||
screenSm: 768,
|
||||
screenSmMax: 991,
|
||||
screenMd: 992,
|
||||
screenMdMax: 1199,
|
||||
screenLg: 1200,
|
||||
},
|
||||
)
|
||||
module.exports = {
|
||||
primary,
|
||||
secondary,
|
||||
disabled,
|
||||
background,
|
||||
fontColor,
|
||||
fancy: fancyColor,
|
||||
warning: warningColor,
|
||||
error: errorColor,
|
||||
connected: connectedColor,
|
||||
xs,
|
||||
sm,
|
||||
md,
|
||||
lg,
|
||||
xl,
|
||||
xxl,
|
||||
border,
|
||||
marginButtonImg,
|
||||
fontSizeHeadingXs: 13,
|
||||
fontSizeHeadingSm: 18,
|
||||
fontSizeHeadingMd: 21,
|
||||
fontSizeHeadingLg: 32,
|
||||
buttonLargeFontSize: '12px',
|
||||
lightFont: 300,
|
||||
regularFont: 400,
|
||||
bolderFont: 500,
|
||||
boldFont: 700,
|
||||
smallFontSize: '11px',
|
||||
mediumFontSize: '13px',
|
||||
largeFontSize: '15px',
|
||||
extraLargeFontSize: '18px',
|
||||
xxlFontSize: '32px',
|
||||
screenXs: 480,
|
||||
screenXsMax: 767,
|
||||
screenSm: 768,
|
||||
screenSmMax: 991,
|
||||
screenMd: 992,
|
||||
screenMdMax: 1199,
|
||||
screenLg: 1200,
|
||||
}
|
||||
|
|