status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development' into 536-notifications-status-labels-sync 

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
fernandomg 2020-05-22 11:25:06 -03:00
parent fb31bcad2b 203c8b0ab3
commit 1be3aa0e3a
9 changed files with 240 additions and 4342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -29,4 +29,3 @@ REACT_APP_APP_VERSION=$npm_package_version
# For Apps
REACT_APP_GNOSIS_APPS_URL=https://safe-apps.staging.gnosisdev.com
REACT_APP_APPS_DISABLED=false

41
package.json
View File

@ -18,6 +18,7 @@
"main": "public/electron.js",
"postinstall": "electron-builder install-app-deps",
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
"build-desktop": "cross-env REACT_APP_BUILD_FOR_DESKTOP=true REACT_APP_ENV=production yarn build-mainnet",
"build-mainnet": "cross-env REACT_APP_NETWORK=mainnet yarn build",
"build": "REACT_APP_APP_VERSION=$npm_package_version react-app-rewired --max-old-space-size=8192 build",
@ -155,43 +156,35 @@
"@material-ui/icons": "4.9.1",
"@material-ui/lab": "4.0.0-alpha.39",
"@openzeppelin/contracts": "3.0.1",
"@welldone-software/why-did-you-render": "4.2.1",
"async-sema": "^3.1.0",
"axios": "0.19.2",
"bignumber.js": "9.0.0",
"bnc-onboard": "1.9.0",
"classnames": "^2.2.6",
"connected-react-router": "6.8.0",
"cross-env": "^7.0.2",
"currency-flags": "2.1.2",
"date-fns": "2.13.0",
"dotenv": "^8.2.0",
"electron-is-dev": "^1.1.0",
"electron-log": "4.1.2",
"electron-updater": "4.3.1",
"ethereum-ens": "0.8.0",
"express": "^4.17.1",
"final-form": "4.19.1",
"final-form-calculate": "^1.3.1",
"final-form": "4.19.1",
"history": "4.10.1",
"immortal-db": "^1.0.2",
"immutable": "^4.0.0-rc.9",
"install": "^0.13.0",
"js-cookie": "^2.2.1",
"lint-staged": "10.2.2",
"lodash.memoize": "^4.1.2",
"material-ui-search-bar": "^1.0.0-beta.13",
"notistack": "https://github.com/gnosis/notistack.git#v0.9.4",
"npm": "6.14.5",
"open": "^7.0.3",
"optimize-css-assets-webpack-plugin": "5.0.3",
"polished": "3.6.3",
"qrcode.react": "1.0.0",
"query-string": "6.12.1",
"react": "16.13.1",
"react-dev-utils": "10.2.1",
"react-dom": "16.13.1",
"react-final-form": "6.4.0",
"react-final-form-listeners": "^1.0.2",
"react-final-form": "6.4.0",
"react-ga": "^2.7.0",
"react-hot-loader": "4.12.21",
"react-qr-reader": "^2.2.1",
@ -199,15 +192,15 @@
"react-router-dom": "5.2.0",
"react-scripts": "^3.4.1",
"react-window": "^1.8.5",
"react": "16.13.1",
"recompose": "^0.30.0",
"redux": "4.0.5",
"redux-actions": "^2.6.5",
"redux-thunk": "^2.3.0",
"redux": "4.0.5",
"reselect": "^4.0.0",
"semver": "7.3.2",
"styled-components": "^5.0.1",
"truffle-contract": "4.0.31",
"wait-on": "5.0.0",
"web3": "1.2.7"
},
"devDependencies": {
@ -216,38 +209,32 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^25.2.1",
"@types/node": "^13.11.0",
"@types/react": "^16.9.32",
"@types/react-dom": "^16.9.6",
"@types/react": "^16.9.32",
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"autoprefixer": "9.7.6",
"classnames": "^2.2.6",
"concurrently": "4.1.2",
"css-loader": "3.5.3",
"detect-port": "^1.3.0",
"cross-env": "^7.0.2",
"dotenv-expand": "^5.1.0",
"electron": "7.1.8",
"dotenv": "^8.2.0",
"electron-builder": "22.2.0",
"electron-notarize": "^0.2.1",
"eslint": "^6.8.0",
"electron": "7.1.8",
"eslint-config-prettier": "6.11.0",
"eslint-plugin-import": "2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.18.3",
"eslint-plugin-sort-destructure-keys": "1.3.4",
"eslint": "^6.8.0",
"ethereumjs-abi": "0.6.8",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"fs-extra": "9.0.0",
"html-loader": "1.1.0",
"husky": "^4.2.2",
"json-loader": "^0.5.7",
"lint-staged": "10.2.2",
"node-sass": "^4.14.1",
"prettier": "2.0.5",
"react-app-rewired": "^2.1.6",
"run-with-testrpc": "0.3.1",
"truffle": "5.1.23",
"truffle-solidity-loader": "0.1.32",
"typescript": "~3.7.2"
"typescript": "~3.7.2" ,
"wait-on": "5.0.0"
}
}

3
src/components/Root/index.tsx
View File

@ -2,7 +2,6 @@ import { theme as styledTheme } from '@gnosis.pm/safe-react-components'
import { MuiThemeProvider } from '@material-ui/core/styles'
import { ConnectedRouter } from 'connected-react-router'
import React from 'react'
import { hot } from 'react-hot-loader/root'
import { Provider } from 'react-redux'
import { ThemeProvider } from 'styled-components'
@ -29,4 +28,4 @@ const Root = () => (
</ThemeProvider>
)
export default hot(Root)
export default Root

10
src/components/layout/Col/index.module.scss
View File

@ -1,4 +1,3 @@
// @ts-nocheck
@import 'src/theme/variables.scss';
.col {
@ -185,6 +184,11 @@
}
}
@media only screen and (min-width: #{$screenXs}px) {
@include col(xs);
@include autoWidth(xs);
}
@media only screen and (min-width: #{$screenSm}px) {
@include col(sm);
@include autoWidth(sm);
@ -200,6 +204,10 @@
@include autoWidth(lg);
}
@media only screen and (min-width: #{$screenXs}px) {
@include row(Xs);
}
@media only screen and (min-width: #{$screenSm}px) {
@include row(Sm);
}

6
src/index.tsx
View File

@ -11,12 +11,6 @@ import { store } from 'src/store'
BigNumber.set({ EXPONENTIAL_AT: [-7, 255] })
if (process.env.NODE_ENV !== 'production') {
// eslint-disable-next-line
const whyDidYouRender = require('@welldone-software/why-did-you-render')
whyDidYouRender(React)
}
store.dispatch(loadActiveTokens())
store.dispatch(loadSafesFromStorage())
store.dispatch(loadDefaultSafe())

20
src/routes/safe/components/Layout/Tabs/index.tsx
View File

@ -100,17 +100,15 @@ const TabsComponent = (props: Props) => {
label={TransactionsLabel}
value={`${match.url}/transactions`}
/>
{process.env.REACT_APP_APPS_DISABLED !== 'true' && (
<Tab
classes={{
selected: classes.tabWrapperSelected,
wrapper: classes.tabWrapper,
}}
data-testid={TRANSACTIONS_TAB_BTN_TEST_ID}
label={AppsLabel}
value={`${match.url}/apps`}
/>
)}
<Tab
classes={{
selected: classes.tabWrapperSelected,
wrapper: classes.tabWrapper,
}}
data-testid={TRANSACTIONS_TAB_BTN_TEST_ID}
label={AppsLabel}
value={`${match.url}/apps`}
/>
<Tab
classes={{
selected: classes.tabWrapperSelected,

12
src/routes/safe/components/Layout/index.tsx
View File

@ -89,13 +89,11 @@ const Layout = (props: Props) => {
<Switch>
<Route exact path={`${match.path}/balances/:assetType?`} render={() => wrapInSuspense(<Balances />, null)} />
<Route exact path={`${match.path}/transactions`} render={() => wrapInSuspense(<TxsTable />, null)} />
{process.env.REACT_APP_APPS_DISABLED !== 'true' && (
<Route
exact
path={`${match.path}/apps`}
render={() => wrapInSuspense(<Apps closeModal={closeGenericModal} openModal={openGenericModal} />, null)}
/>
)}
<Route
exact
path={`${match.path}/apps`}
render={() => wrapInSuspense(<Apps closeModal={closeGenericModal} openModal={openGenericModal} />, null)}
/>
<Route exact path={`${match.path}/settings`} render={() => wrapInSuspense(<Settings />, null)} />
<Route exact path={`${match.path}/address-book`} render={() => wrapInSuspense(<AddressBookTable />, null)} />
<Redirect to={`${match.path}/balances`} />

4
src/routes/safe/components/Transactions/TxsTable/columns.tsx
View File

@ -1,5 +1,7 @@
import { BigNumber } from 'bignumber.js'
import { format, getTime, parseISO } from 'date-fns'
import format from 'date-fns/format'
import getTime from 'date-fns/getTime'
import parseISO from 'date-fns/parseISO'
import { List, Map } from 'immutable'
import React from 'react'

4485
yarn.lock
View File

File diff suppressed because it is too large Load Diff