Commit Graph

766 Commits

Author SHA1 Message Date
Jonathan Rainville 251ed46daa
Merge pull request #153 from status-im/feat/add-cra
Update Teller to use CRA instead of embark's pipeline
2019-04-03 08:58:44 -04:00
Jonathan Rainville 173eb5696f
fix storybook and unit test runner 2019-04-02 13:46:18 -04:00
Jonathan Rainville 2a65be383b
put pipeline back to true while embark is not updated 2019-04-02 13:46:17 -04:00
Jonathan Rainville 2ce3a93efc
update readme about how to run 2019-04-02 13:46:17 -04:00
Jonathan Rainville df8c65f5e8
feat: update to use CRA instead of Embark's pipeline 2019-04-02 13:46:17 -04:00
Jonathan Rainville 3414edce12
Merge pull request #152 from status-im/fix/post-offer-link
Fix button not on same line in small screens
2019-04-02 13:43:42 -04:00
Jonathan Rainville 795727eed5
fix(footer): fix buttons not on the same line because of padding 2019-04-02 13:42:28 -04:00
Richard Ramos 55d109ffd1
fix: created interface for factory to avoid circular dependences (#151) 2019-04-01 14:59:21 -04:00
Richard Ramos 1687d7add8
fix: remove circular dependence by extracting arbitrable interface from escrow (#150) 2019-04-01 14:33:00 -04:00
Iuri Matias 711a6af678
Merge pull request #149 from status-im/feat/escrow-funding
feat: fund escrows
2019-03-31 09:29:55 -04:00
Richard Ramos 539a8fa71b handle funding of tokens different from SNT 2019-03-29 20:43:22 -04:00
Richard Ramos 1854c559af reset funding status 2019-03-29 20:42:42 -04:00
Richard Ramos a53e09aee1 show fund button if tokens are approved 2019-03-29 20:42:42 -04:00
Richard Ramos af948e13cd fill escrow initial stage with correct data 2019-03-29 20:40:23 -04:00
Iuri Matias 6dd38cbbd9
Merge pull request #148 from status-im/feat/escrow-approval
feat: approve tokens before funding
2019-03-29 17:43:18 -04:00
Richard Ramos bb14592580 fix: expiration time 2019-03-29 17:01:15 -04:00
Richard Ramos ec6298879a fix: do not query allowance for ethereum 2019-03-29 17:01:15 -04:00
Richard Ramos 01dee410f6 feat: add test for funding escrows 2019-03-29 17:01:15 -04:00
Richard Ramos 8bd558f677 added proptypes 2019-03-29 17:01:15 -04:00
Richard Ramos f42e527d45 show fund button if tokens are approved 2019-03-29 17:01:15 -04:00
Richard Ramos 00711e477d add reducers to blacklist 2019-03-29 17:01:15 -04:00
Richard Ramos b6cee3ed34 get token allowances 2019-03-29 17:00:44 -04:00
Richard Ramos bf0f3f7636 feat: added test token 2019-03-29 17:00:44 -04:00
Richard Ramos 3fcde43e67 feat: approval for selling SNT and for paying SNT fees 2019-03-29 17:00:44 -04:00
Richard Ramos df0c911408 fix 2019-03-29 17:00:44 -04:00
Richard Ramos 448b56e652 plugged feature in saga/reducer. Added SNT allowance action 2019-03-29 17:00:44 -04:00
Richard Ramos a5425526fc added approval feature 2019-03-29 17:00:44 -04:00
Richard Ramos 2bd5d585ad added fund approval component 2019-03-29 16:59:58 -04:00
Iuri Matias 7d9903a46c
Merge pull request #147 from status-im/fix/contact-code-validation
fix: contact code validation
2019-03-29 16:41:01 -04:00
Iuri Matias da389753b5
Merge pull request #145 from status-im/fix/trade-margin-prices
fix: trade margin prices
2019-03-29 16:40:55 -04:00
Iuri Matias a793efdda3
Merge pull request #143 from status-im/feat/escrow-page-details
feat: Escrow Detail Page with correct initial state
2019-03-29 16:40:49 -04:00
Iuri Matias ff63fdcd80
Merge pull request #146 from status-im/fix/persist-level-2
fix: network feature wasn't being loaded correctly due to redux-persist settings
2019-03-29 16:40:25 -04:00
Iuri Matias 8ce71ea35c
Merge pull request #144 from status-im/fix/decimal-handling
fix:  wrong decimal handling
2019-03-29 16:40:17 -04:00
Iuri Matias 0b68104463
Merge pull request #142 from status-im/arbitration-detail-page
feat: arbitration detail page
2019-03-29 16:40:08 -04:00
Richard Ramos 7826d766d1 fix: test unit 2019-03-28 20:54:51 -04:00
Richard Ramos 4f5d1f4a78 fix: lint 2019-03-28 20:41:08 -04:00
Richard Ramos bb0b66b71d fix: lint 2019-03-28 20:39:21 -04:00
Richard Ramos 8cd66b8291 fix: contact code validation 2019-03-28 09:47:08 -04:00
Richard Ramos 0fa0d8c40b fix: network feature wasn't being loaded 2019-03-27 16:19:59 -04:00
Richard Ramos 73aa247fe1 fix: trade margin prices 2019-03-27 11:25:37 -04:00
Richard Ramos 7c1990f164 fix: wrong decimal handling 2019-03-27 10:41:52 -04:00
Richard Ramos 6d65f3cdf7 fill escrow initial stage with correct data 2019-03-26 11:12:10 -04:00
Barry G 7198121581 add hardSet state reconciler (#141) 2019-03-26 08:56:21 -04:00
Richard Ramos a343e3b70e fix 2019-03-25 14:52:00 -04:00
Richard Ramos b03ec8d561 fix 2019-03-25 14:49:45 -04:00
Richard Ramos bf220a58ae arbitration details styles 2019-03-25 14:48:01 -04:00
Richard Ramos f4f2ee1549 load escrow details 2019-03-25 10:22:58 -04:00
Iuri Matias 80776735c0
Merge pull request #139 from status-im/feat/gitattributes
feat: add .gitattributes
2019-03-22 13:22:33 -04:00
Iuri Matias 952e207af6
Merge pull request #138 from status-im/feat/trade-pricing-details
feat: show pricing details for escrow based on asset price
2019-03-22 13:22:26 -04:00
Iuri Matias 21ebe06308
Merge pull request #137 from status-im/feat/asset-price
feat: store asset prices when an escrow is created
2019-03-22 13:22:13 -04:00