Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
a913342
WA-238 updating package.json with project name and next version
apanizo Apr 26, 2018
9820450
WA-238 Add Balance List component
apanizo Apr 26, 2018
9904e1b
WA-238 Add recompose library
apanizo Apr 26, 2018
b7d4944
WA-238 Create openHoc component using withStateHandlers
apanizo Apr 26, 2018
64c0341
WA-238 Adding WithStyles type in theme/mui.js
apanizo Apr 26, 2018
ee23a77
WA-238 Owners ListItem component of Safe
apanizo Apr 26, 2018
0d7f52a
WA-238 Confirmations ListItem component for Safe
apanizo Apr 26, 2018
35788d9
WA-238 Address ListItem component for Safe
apanizo Apr 26, 2018
82c2522
WA-238 created GnoListItemText with cut ellipsis prop
apanizo Apr 26, 2018
4b39ebf
WA-238 Refactor Safe component leaving space for user interaction
apanizo Apr 26, 2018
854952f
WA-238 Including Daily Limit in form
apanizo Apr 27, 2018
7dbc14f
WA-238 Updating review safe creation view with Daily Limit
apanizo Apr 27, 2018
7a05972
WA-238 Fixing tests including Daily Limit
apanizo Apr 27, 2018
d3ab3ec
WA-238 Adding Daily Limit when showing safe route
apanizo Apr 27, 2018
69a486a
WA-238 Adding Daily Limit when displaying the list of safes
apanizo Apr 27, 2018
92f092c
Merge pull request #22 from gnosis/feature/WA-238-add-daily-limit
apanizo Apr 27, 2018
fdca178
WA-238 Specify daily limit validation. Should be greater than 0
apanizo Apr 27, 2018
0a646ad
WA-238 Adding 4.1.15 version
apanizo Apr 30, 2018
9735b73
WA-238 Running optmized improvements of safe contracts
apanizo Apr 30, 2018
ec9c78b
WA-238 Deploying contracts with Daily limit and ProxyFactory
apanizo Apr 30, 2018
d8dc520
WA-238 Removing unused code for fetching balance
apanizo May 2, 2018
2cd5537
WA-238 Adding assSafe action type
apanizo May 2, 2018
068b08e
WA-238 Creating Safe Master Copy once
apanizo May 2, 2018
b5bafe2
WA-238 Reusing deployed master contracts
apanizo May 2, 2018
7f53e43
WA-238 FIX creating master copy if contract has not been deployed
apanizo May 2, 2018
23d4ad9
Merge pull request #23 from gnosis/feature/WA-238-include-daily-limit
apanizo May 2, 2018
e4c56f8
WA-238 Added contracts after migrated to Kovan and Rinkeby
apanizo May 4, 2018
f145d12
WA-238 Adding safe-contracts
apanizo May 4, 2018
8be0679
Merge pull request #24 from gnosis/feature/WA-238-use-proxy-contract-…
apanizo May 7, 2018
9f2ea3d
WA-238 Adding gnosis-safe logo on safe details view
apanizo May 7, 2018
88795cf
WA-238 Logic for showing Withdrawn form after clicking on Safe's button
apanizo May 7, 2018
32f88a8
WA-238 Specifying Go address and title in Stepper via props
apanizo May 8, 2018
2359ba6
WA-238 Adding TXS address
apanizo May 8, 2018
fe7a936
WA-238 Include the go title and to properties in Open route component
apanizo May 8, 2018
8d3bfa8
WA-238 Adding logic for withdrawing safe's funds
apanizo May 8, 2018
b472142
WA-238 Withdrawn Review component
apanizo May 8, 2018
2d63300
WA-238 Withdrawn Form component
apanizo May 8, 2018
48dcf7c
WA-238 Withdrawn component
apanizo May 8, 2018
8f95eee
WA-238 Improve Withdrawn CSS look and feel
apanizo May 8, 2018
f882c55
WA-238 Fix indentation Withdrawn Review component
apanizo May 8, 2018
3ce8383
WA-238 Redeployed Gnosis Safe contracts
apanizo May 8, 2018
c2fd9fb
WA-238 Fix async status on getExtensions when withdrawing safe's funds
apanizo May 8, 2018
7569002
WA-238 Including DailyLimit when creating the safe
apanizo May 9, 2018
91f142f
WA-238 Adding dailyLimit withdrawn DOM test
apanizo May 9, 2018
7b96967
WA-238 Updating contracts
apanizo May 10, 2018
3c740c0
WA-238 Updating code to new safe-contracts version
apanizo May 10, 2018
5f1931c
WA-238 Cleanning tests
apanizo May 10, 2018
1e42b3d
WA-238 Adapting dailyLimit in safes to store the amount spent
apanizo May 11, 2018
86fad26
WA-238 get Daily Limit by token from the safe smart contract (useful …
apanizo May 11, 2018
79ae475
WA-238 creation of updateDailyLimit action
apanizo May 13, 2018
aa93a83
WA-238 refactor update deployedSafe builder including execture withd…
apanizo May 13, 2018
3cba259
WA-238 DailyLimit Record types
apanizo May 13, 2018
4a30051
WA-238 fetchDailyLimit action definition and its reducer
apanizo May 13, 2018
cefa6d5
WA-238 Do not update safes in localStorage when updating DailyLimit
apanizo May 14, 2018
8b5aad2
WA-238 Updating deployment of sc
apanizo May 14, 2018
725a9f6
WA-238 Fix error on reducer not using action's payload property
apanizo May 14, 2018
4051852
WA-238 Returning promise when executing dailyLimit tx
apanizo May 14, 2018
26815af
WA-238 Adding test handling exception when exceeding dailyLimit
apanizo May 14, 2018
706bdba
WA-238 Adding test updating safe's daily limit redux record after exe…
apanizo May 14, 2018
f04eec5
WA-238 Storybook showing spentToday and disabling withdrawn buttons i…
apanizo May 14, 2018
d0860df
WA-238 Not allowing to wthdrawn if limit is exceeded
apanizo May 14, 2018
a4a519a
WA-238 Modify redirect of withdrawn stepper
apanizo May 14, 2018
d66ef07
WA-238 Delaying fetchDailyLimit after withdrawing
apanizo May 14, 2018
d61bf58
WA-238 Fix delay in tests avoiding JEST default error
apanizo May 14, 2018
98ce8f1
WA-238 Adding more time to execute the tx in background
apanizo May 14, 2018
c711c62
WA-238 Increasing the jest.setTimeout time
apanizo May 14, 2018
608e4c1
WA-238 Giving more time to mine tx when deploying safes
apanizo May 14, 2018
5531e0f
Merge pull request #26 from gnosis/feature/WA-238-daily-limit-logic
apanizo May 16, 2018
8542a25
Merge pull request #25 from gnosis/feature/WA-238-withdrawn-form-comp…
apanizo May 16, 2018
140d393
WA-238 reducing initial load increasing vendors Webpack 4 optimization
apanizo May 16, 2018
c997bb4
WA-238 Fixing flow errors
apanizo May 16, 2018
fb01100
WA-238 Updating safe-contracts
apanizo May 16, 2018
e3c4c76
WA-238 adapt safeContracts> initContracts and code when creating safe…
apanizo May 16, 2018
e25ccbe
WA-238 Adding tests for safesByOwnerSelector
apanizo May 17, 2018
4a10483
WA-238 Fix onClick reset fn hook in Stepper component after tx is fin…
apanizo May 17, 2018
a16b5ed
WA-238 Add test safesByOnwer selector with casi insensitive comparing…
apanizo May 17, 2018
7efcf44
WA-238 Adding confirmation and transaction model entities (Immutable …
apanizo May 21, 2018
302fc13
WA-238 Refactor localStorage class allowing load data by key
apanizo May 21, 2018
60d7f90
WA-238 Transaction tests for storing confirmations
apanizo May 21, 2018
3f77bc1
WA-238 Tests checking owners conditions
apanizo May 21, 2018
29e92ca
WA-238 Refactor transaction tests
apanizo May 22, 2018
bd2e6b7
WA-238 Allowing set a Daily Limit of 0 when creating a Safe
apanizo May 22, 2018
ec25ae2
WA-238 Updating contracts and removing old ones
apanizo May 22, 2018
26c4d8f
WA-238 added grantedSelector and its test for displaying safe if user…
apanizo May 22, 2018
bb3c512
WA-238 Using NoRights component on safe route layout
apanizo May 22, 2018
63cb857
WA-238 Rename calculateInitialState to safeInitialState
apanizo May 22, 2018
89b1b5f
WA-238 adding transactions property to redux store
apanizo May 22, 2018
f4ca495
WA-238 Adding fetchTransactions action
apanizo May 22, 2018
b784316
Merge pull request #27 from gnosis/feature/WA-238-load-safes-by-owner
apanizo May 23, 2018
bc9b2be
WA-238 Add TXs row in Safe view
apanizo May 23, 2018
0fb1758
WA-238 Added test for enabling add tx button when the safe has funds
apanizo May 23, 2018
3dcb551
WA-238 Multisig transaction form
apanizo May 23, 2018
fdfecee
WA-238 Fix Withdrawn and Multisig Forms
apanizo May 23, 2018
67552e2
WA-238 Review TX component
apanizo May 23, 2018
f940739
WA-238 refactor inLimit form validator
apanizo May 24, 2018
abb9497
WA-238 Adding create multisig tx logic
apanizo May 24, 2018
f42aa07
WA-238 rename createTransaction to storeTransaction
apanizo May 24, 2018
ad7157b
WA-238 include hash in Confirmation record, added tests for safes wit…
apanizo May 24, 2018
38953cf
WA-238 Adjust createTransaction function to be executed correctly
apanizo May 24, 2018
cbf29c1
WA-238 Including only the txHash in the redux store of confirmations
apanizo May 24, 2018
3268d76
WA-238 Rename transactions form component to AddTRansaction
apanizo May 25, 2018
59bd50d
WA-238 Deploy safe-contracts
apanizo May 26, 2018
48a5804
WA-238 Hairline layout component
apanizo May 26, 2018
8abc514
WA-238 Transaction List component
apanizo May 26, 2018
44ed495
WA-238 Adding tests of confirmations and transactions selectors
apanizo May 26, 2018
5085a18
WA-238 Adding DOM test simulating execution of tx when safe has only …
apanizo May 26, 2018
0c4708b
WA-238 Fix warning text boolean prop
apanizo May 26, 2018
4caacdb
WA-238 Implementation and UI adaptation to process ttransactions
apanizo May 27, 2018
8e908bb
WA-238 Added a test for assuring grantedSelector works in a case-inse…
apanizo May 27, 2018
efe2905
WA-238 Fix automic onClick calls
apanizo May 27, 2018
bd00e4a
WA-238 update safe-contracts
apanizo May 27, 2018
192eb9b
WA-238 Updating Truffle to 4.1.11
apanizo May 27, 2018
194e51d
WA-238 Fix updating executed txs
apanizo May 27, 2018
f917bb2
WA-238 sameAddress helper for avoid case sensitive problems with eth …
apanizo May 27, 2018
071fee9
WA-238 Fix withdrawn smart contract function
apanizo May 27, 2018
547f144
WA-238 Add new deployment of safe-contracts
apanizo May 28, 2018
a7076b9
WA-238 Implementing mustBeInteger validator on threshold and num of o…
apanizo May 29, 2018
cfdbc8a
WA-238 Fixing error of safes 1+ owners and threshold 1 when sending txs
apanizo May 29, 2018
37c4076
WA-238 Updating smart contracts
apanizo May 29, 2018
649243c
WA-238 Fixing problem increasing threshold in UI Transaction's view
apanizo May 30, 2018
557a2e1
WA-238 Not allowing user who has confirmed tx do it again
apanizo May 30, 2018
ad94d78
WA-238 Update safe-contracts
apanizo May 30, 2018
6e221da
WA-238 Do not redeploy master copies if the instances do not work
apanizo May 31, 2018
cc548e9
WA-238 Added bigNumber as library
apanizo May 31, 2018
fff325b
WA-238 Added ethTransactions helper function
apanizo May 31, 2018
99507a0
WA-238 usage of ethTransactions functions on createTransactions
apanizo May 31, 2018
b2a0298
WA-238 usage of executeTransaction on processTransaction helper
apanizo May 31, 2018
6ee48db
WA-238 Fix calculation of executed tx hash when threshold was not rea…
apanizo May 31, 2018
5ce3564
WA-238 Fix createTransactions when safe has only one owner
apanizo May 31, 2018
2c98b2e
Merge pull request #30 from gnosis/feature/WA-238-safe-txs-frontend
apanizo May 31, 2018
948196b
Merge pull request #31 from gnosis/feature/WA-238-implementation-mult…
apanizo May 31, 2018
74f3758
WA-238 Removing old contracts
apanizo May 31, 2018
060a708
WA-238 Bringing back safe-contracts
apanizo May 31, 2018
52203bc
WA-238 Init contracts for test mode only used in travis
apanizo May 31, 2018
8da8071
Merge pull request #33 from gnosis/feature/WA-238-run-tests-in-travis
apanizo May 31, 2018
a759328
WA-238 calculating gas and gasPrice when creating safe
apanizo Jun 1, 2018
23f0af9
WA-238 Silence tests' output
apanizo Jun 1, 2018
acfa2f4
WA-238 Created DOM test for multisig tx on safe with 3 owners with 3 …
apanizo Jun 1, 2018
9c21fb8
WA-238 Adding tests helper for checking multisig tx with safes with 1…
apanizo Jun 4, 2018
d31dc60
WA-238 Adding DOM test for 1 safe with 3 owners and 1 threshold
apanizo Jun 4, 2018
ddf43fc
WA-238 Refactoring 3 owners 3 threshold DOM test
apanizo Jun 4, 2018
b1177b1
Merge pull request #34 from gnosis/feature/WA-238-simulating-multisig…
apanizo Jun 4, 2018
d7ff250
WA-238 Adding gasStation and pre calculation of costs to withdrawn txs
apanizo Jun 4, 2018
e10828e
WA-238 disable Withdrawn button
apanizo Jun 4, 2018
2018938
WA-238 increasing time in tests for updating UI after creating a safe
apanizo Jun 4, 2018
504e078
WA-238 Increasing time for rendering the Withdrawn component
apanizo Jun 4, 2018
9b582f6
WA-238 Give more time to safe to show the received balance in tests
apanizo Jun 4, 2018
46a1737
Merge pull request #32 from gnosis/feature/WA-238-withdrawn-blockchai…
apanizo Jun 4, 2018
4c5d28d
WA-238 Checking tx receipt status on withdrawn mutlsig txs
apanizo Jun 4, 2018
b6a0420
Merge pull request #35 from gnosis/feature/WA-238-check-tx-receipt-st…
apanizo Jun 6, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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]
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
node_modules/
build/
build_webpack/
build_storybook/
build/contracts/
truffle-config.js
gnosis-safe-contracts/
.DS_Store
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions config/jest/jest.setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// @flow
jest.setTimeout(30000)
2 changes: 1 addition & 1 deletion config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
3 changes: 3 additions & 0 deletions config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/,
Expand All @@ -86,6 +88,7 @@ module.exports = {
minSize: 1,
},
},
*/
},
},
entry: [
Expand Down
2 changes: 1 addition & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"baseUrl": "./",
"paths": {
"~/*":["src/*"],
"@/*":["gnosis-safe-contracts/build/contracts"]
"@/*":["safe-contracts/build/contracts"]
}
},
"exclude": [
Expand Down
20 changes: 12 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
],
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
}
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```
Expand Down
Loading