Merge pull request #37 from gnosis/development

WA-238 Withdrawn

.flowconfig

@@ -17,7 +17,7 @@ module.file_ext=.css
 module.file_ext=.scss
 
 module.name_mapper='^~' ->'<PROJECT_ROOT>/src'
-module.name_mapper='^#' ->'<PROJECT_ROOT>/gnosis-safe-contracts/build/contracts'
+module.name_mapper='^#' ->'<PROJECT_ROOT>/safe-contracts/build/contracts'
 module.name_mapper='.*\(.s?css\)' -> '{}'
 
 [strict]

.gitignore

@@ -1,8 +1,4 @@
 node_modules/
-build/
 build_webpack/
 build_storybook/
-build/contracts/
-truffle-config.js
-gnosis-safe-contracts/
 .DS_Store

.travis.yml

@@ -4,20 +4,17 @@ node_js:
 os:
   - linux
 before_script:
-  - yarn global add truffle@4.1.3
   - yarn global add surge
-  - git clone https://github.com/gnosis/gnosis-safe-contracts.git
-  - cd gnosis-safe-contracts
-  - truffle compile && cd ..
+  - export NODE_ENV=testing
 after_success:
-  - yarn build-storybook
-  - yarn build
   - |
     if [ ${TRAVIS_BRANCH} = "master" ]; then
       export NODE_ENV=production;
     else
       export NODE_ENV=development;
     fi
+  - yarn build-storybook
+  - yarn build
   - cd build_webpack/ && cp index.html 200.html && cd ..
   - chmod ugo+x ./config/deploy/deploy.sh
   - ./config/deploy/deploy.sh

config/jest/jest.setup.js

@@ -0,0 +1,2 @@
+// @flow
+jest.setTimeout(30000)

config/paths.js

@@ -38,7 +38,7 @@ module.exports = {
   appIndexJs: resolveApp('src/index.js'),
   appPackageJson: resolveApp('package.json'),
   appSrc: resolveApp('src'),
-  appContracts: resolveApp('gnosis-safe-contracts/build/contracts'),
+  appContracts: resolveApp('safe-contracts/build/contracts'),
   yarnLockFile: resolveApp('yarn.lock'),
   testsSetup: resolveApp('src/setupTests.js'),
   appNodeModules: resolveApp('node_modules'),

config/webpack.config.prod.js

@@ -77,6 +77,8 @@ module.exports = {
   bail: true,
   optimization: {
     splitChunks: {
+      chunks: "all",
+      /* https://stackoverflow.com/questions/48985780/webpack-4-create-vendor-chunk
       cacheGroups: {
         vendor: {
           test: /node_modules/,
@@ -86,6 +88,7 @@ module.exports = {
           minSize: 1,
         },
       },
+      */
     },
   },
   entry: [

jsconfig.json

@@ -5,7 +5,7 @@
     "baseUrl": "./",
     "paths": {
       "~/*":["src/*"],
-      "@/*":["gnosis-safe-contracts/build/contracts"]
+      "@/*":["safe-contracts/build/contracts"]
     }
   },
   "exclude": [

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "gnosis-team-safe",
-  "version": "1.0.0",
+  "name": "safe-react",
+  "version": "0.3.2",
   "description": "Allowing crypto users manage funds in a safer way",
   "directories": {
     "test": "test"
@@ -9,22 +9,22 @@
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
     "test": "run-with-testrpc -l 40000000 'node scripts/test.js --env=jsdom'",
-    "test-local": "node scripts/test.js --env=jsdom",
+    "test-local": "NODE_ENV=test && node scripts/test.js --env=jsdom",
     "precommit": "./precommit.sh",
     "flow": "flow",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook -o build_storybook"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/gnosis/gnosis-team-safe"
+    "url": "https://github.com/gnosis/safe-react"
   },
   "author": "Gnosis Team",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/gnosis/gnosis-team-safe/issues"
+    "url": "https://github.com/gnosis/safe-react/issues"
   },
-  "homepage": "https://github.com/gnosis/gnosis-team-safe#readme",
+  "homepage": "https://github.com/gnosis/safe-react#readme",
   "pre-commit": [
     "precommit"
   ],
@@ -50,6 +50,7 @@
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-transform-es3-member-expression-literals": "^6.22.0",
     "babel-plugin-transform-es3-property-literals": "^6.22.0",
+    "bignumber.js": "^7.2.1",
     "classnames": "^2.2.5",
     "css-loader": "^0.28.10",
     "detect-port": "^1.2.2",
@@ -87,6 +88,7 @@
     "storybook-host": "^4.1.5",
     "storybook-router": "^0.3.3",
     "style-loader": "^0.20.2",
+    "truffle": "git://github.com/trufflesuite/truffle.git#develop",
     "truffle-contract": "^1.1.8",
     "truffle-solidity-loader": "0.0.8",
     "uglifyjs-webpack-plugin": "^1.2.2",
@@ -104,13 +106,15 @@
     "material-ui-icons": "^1.0.0-beta.35",
     "react-final-form": "^3.1.2",
     "react-loadable": "^5.3.1",
-    "react-router-dom": "^4.2.2"
+    "react-router-dom": "^4.2.2",
+    "recompose": "^0.27.0"
   },
   "jest": {
     "verbose": true,
     "collectCoverageFrom": [
       "src/**/*.{js,jsx}"
     ],
+    "setupTestFrameworkScriptFile": "<rootDir>/config/jest/jest.setup.js",
     "setupFiles": [
       "<rootDir>/config/webpack.config.test.js",
       "<rootDir>/config/polyfills.js",
@@ -134,7 +138,7 @@
     ],
     "moduleNameMapper": {
       "~(.*)$": "<rootDir>/src/$1",
-      "#(.*)$": "<rootDir>/gnosis-safe-contracts/build/contracts/$1",
+      "#(.*)$": "<rootDir>/safe-contracts/build/contracts/$1",
       "^react-native$": "react-native-web"
     }
   }

readme.md

@@ -14,7 +14,7 @@ What things you need to install the software and how to install them
 npm install truffle // recommended usage of -g flag
 npm install ganache-cli // recommended usage of -g flag
 npm install flow-type // recommended usage of -g flag
-git clone https://github.com/gnosis/gnosis-safe-contracts.git
+git clone https://github.com/gnosis/safe-contracts.git
 ```
 
 ### Installing
@@ -28,7 +28,7 @@ ganache-cli -b 3
 
 Start the project in the other one
 ```
-cd gnosis-safe-contracts && truffle compile && truffle migrate && cd ..
+cd safe-contracts && truffle compile && truffle migrate && cd ..
 npm install
 npm start
 ```