Commit Graph

766 Commits

Author SHA1 Message Date
Iuri Matias 62e13bbc82
Merge pull request #290 from status-im/fix/zero-cost-offer
Fix small stuff
2019-05-30 07:55:38 -04:00
Iuri Matias b82c7e023f
Merge pull request #289 from status-im/fix/map-buttons
fix: map buttons bringing to an empty page
2019-05-30 07:55:32 -04:00
Jonathan Rainville 0df4723409
fix snap 2019-05-29 16:15:24 -04:00
Jonathan Rainville 5bcd9b4927
fix: 0 cost offers and too small input 2019-05-29 16:11:54 -04:00
Jonathan Rainville ea8fe32908
fix: back button on home page on first load 2019-05-29 16:07:17 -04:00
Jonathan Rainville 8a1fe3e05d
Merge pull request #288 from status-im/fix/decimals
fix: remove useless zeros
2019-05-29 16:00:32 -04:00
Jonathan Rainville b8ec09ad40
Merge pull request #287 from status-im/fix/canceled-tag
fix: fix color of grey tags
2019-05-29 16:00:14 -04:00
Jonathan Rainville 4222c6ff57
fix: map buttons bringing to an empty page 2019-05-29 15:50:13 -04:00
Jonathan Rainville 513835b2ba
fix snapshot 2019-05-29 15:46:58 -04:00
Jonathan Rainville 50fc33aac3
fix: remove useless zeros 2019-05-29 15:40:33 -04:00
Jonathan Rainville 076920da9b
fix: fix color of grey tags 2019-05-29 15:28:50 -04:00
Iuri Matias 2bac476c01
Merge pull request #286 from status-im/feat/imporve-trade
Improve trade page to make it clearer
2019-05-29 15:26:39 -04:00
Jonathan Rainville c140e6018f
feat: improve trade page to make it clearer 2019-05-29 15:11:33 -04:00
Jonathan Rainville 347ffd5697
Merge pull request #285 from status-im/fix/error-in-escrow
Show error on escrow even when switching page
2019-05-29 13:27:02 -04:00
Jonathan Rainville 95d9b847d5
fix(escrow): show error on escrow even when switching page 2019-05-29 13:08:01 -04:00
Iuri Matias 2118b581a0
Merge pull request #284 from status-im/chore/remove-market
Remove market type and use margin directly
2019-05-29 13:05:35 -04:00
Iuri Matias f4f21f2265
Merge pull request #282 from status-im/feat/make-escrow-reactive
Watch escrow events to make workflow reactive
2019-05-29 13:05:28 -04:00
Jonathan Rainville fcf86a4e53
feat: only watch events once 2019-05-29 12:44:12 -04:00
Jonathan Rainville 85355b8cbc
feat: add event watchers for escrow events 2019-05-29 12:44:07 -04:00
Richard Ramos 6595f92506
fix: allow buyers to cancel an escrow (#283)
* fix: allow buyers to cancel an escrow

* fix: refund to seller
2019-05-29 11:47:14 -04:00
Richard Ramos 9d032b30e9
feat: cancel arbitration UI + feature (#280)
* feat: cancel arbitration button and feature

* fix: code review
2019-05-29 11:47:04 -04:00
Jonathan Rainville f8960ad9eb
chore: remove margin everywhere in the front-end 2019-05-29 10:01:29 -04:00
Jonathan Rainville 9919a8feb4
chore: remove market from contract and fix tests accordingly 2019-05-29 08:59:27 -04:00
Iuri Matias 3ed358eb08
Merge pull request #277 from status-im/feat/arbitrator-profile
feat: profile for arbitrators
2019-05-28 15:43:12 -04:00
Iuri Matias 56f7c89847
Merge pull request #275 from status-im/feat/back-button
Add a Back button on all pages except some
2019-05-28 15:42:45 -04:00
Richard Ramos 6307b70953
fix: show dispute resolved page once trx is confirmed (#276) 2019-05-28 15:22:55 -04:00
Richard Ramos bb64eb0fc7
feat: Allow unsolved arbitrations to be cancelled (#278) 2019-05-28 15:22:29 -04:00
Richard Ramos f159babe63 feat: profile for arbitrators 2019-05-28 14:39:51 -04:00
Jonathan Rainville 1de3769b1b
feat: add back button on all pages except blacklisted ones 2019-05-28 11:17:43 -04:00
Jonathan Rainville b142493d6b
Merge pull request #274 from status-im/feat/margin-slider
feat(margin): use a slider for the margin selector
2019-05-28 09:25:47 -04:00
Jonathan Rainville e18418d169
feat(margin): use a slider for the margin selector 2019-05-27 16:50:14 -04:00
Iuri Matias 18fb1c4eaa
Merge pull request #273 from status-im/fix/escrow-arbitration
Show who won and lost arbitrations
2019-05-27 11:03:47 -04:00
Jonathan Rainville ab680c22a7
code reviews for using constants and change text 2019-05-27 10:31:33 -04:00
Jonathan Rainville 9340be82d1
fix test 2019-05-27 09:10:47 -04:00
Jonathan Rainville f4ce3d02e5
feat: add resolvedDispute screen to show if you won the dispute 2019-05-24 16:35:25 -04:00
Jonathan Rainville 0b5afa32c0
feat: show color for winning or losing arbitration in profile 2019-05-24 15:49:19 -04:00
Jonathan Rainville 7f593a74d5
feat: show dispute winner on arbitration screen 2019-05-24 15:36:59 -04:00
Jonathan Rainville 6083578311
Merge pull request #272 from status-im/fix/arbitration-details
Add buyer or seller badge in arbitration
2019-05-24 15:25:41 -04:00
Jonathan Rainville f1d1d8458a
Merge pull request #271 from status-im/fix/sorter
Fix filters
2019-05-24 15:02:14 -04:00
Jonathan Rainville 9f1ee69cec
Merge pull request #270 from status-im/fix/infinite-loop
Fix infinite loop in the Sell page and add txHash to addOffer
2019-05-24 15:02:02 -04:00
Jonathan Rainville 276021d402
feat(arbitration): add buyer or seller badge in arbitration 2019-05-24 15:01:15 -04:00
Jonathan Rainville 01e3074b3a
fix(filter): fix asset filter 2019-05-24 12:46:09 -04:00
Jonathan Rainville c33acf5453
fix(offers-list): fix number of seller 2019-05-24 12:35:40 -04:00
Jonathan Rainville bd913fa081
fix(filter): fix payment method filter 2019-05-24 11:51:47 -04:00
Jonathan Rainville 81fdc7dccb
fix: reset seller state after submitting an offer 2019-05-24 11:29:25 -04:00
Jonathan Rainville 233b60996c
feat: add txHash to addOffer 2019-05-24 11:08:04 -04:00
Jonathan Rainville d13016f8d6
fix: data openCase arguments 2019-05-24 11:07:21 -04:00
Jonathan Rainville 2cdf3abd73
Merge pull request #269 from status-im/chore/remove-useless-calls
Remove useless blockchain calls and use the state instead
2019-05-24 10:45:42 -04:00
Jonathan Rainville c26b89f280
fix: arbitration styling 2019-05-24 10:27:29 -04:00
Jonathan Rainville 8a4212f052
chore: remove buyerInfo from arbitration and move it to Dispute 2019-05-24 10:03:15 -04:00