2998ada711
add logrocket ( #370 )
...
* add logrocket
* disable logrocket in development
2019-07-12 11:09:42 -04:00
f0a08f489c
Merge pull request #368 from status-im/kyber_integration_plus_plus
...
feat: kyber integration
2019-07-11 12:37:09 -04:00
0d45bdd53c
Merge pull request #367 from status-im/fix/relase-no-arbitrator
...
Fix releasing SNT escrows where there is no arbitrator
2019-07-11 12:33:43 -04:00
5a24318c5a
fix: arbitrator approval ( #366 )
...
* fix: arbitrator approval
2019-07-11 10:29:36 -04:00
a6948eb82b
disabling staking contract
2019-07-11 10:21:06 -04:00
abd60a9b5b
feat: updated config to take in account KyberFeeBurner contract, and disabled StakingPool
2019-07-11 09:44:34 -04:00
daf0bc8734
add test to release with no arbitrator
2019-07-11 08:57:06 -04:00
eb723c0d28
feat: kyber burner contract
2019-07-10 18:44:16 -04:00
e8f8530c8c
feat: added fee burner contract
2019-07-10 17:39:38 -04:00
1b574cd0b6
Merge pull request #365 from status-im/fix/infinite-loading-2
...
fix: overriding the balance in tokens
2019-07-10 16:45:38 -04:00
ff871d701a
fix: overriding the balance in tokens
2019-07-10 14:54:19 -04:00
9b93a690d2
fix: zeroAddress
2019-07-09 15:29:11 -04:00
9a4f007d71
fix: preload buyer contact data and enable next button ( #364 )
2019-07-09 15:28:06 -04:00
a100dde838
fix: arbitrator array index was incorrect ( #363 )
2019-07-09 15:08:27 -04:00
2873c1cb52
fix changing the balance infinitely ( #362 )
2019-07-09 14:33:09 -04:00
31c305f02f
feat: add arbitrator info to escrow details ( #361 )
...
* feat: add arbitrator details to escrow page
* feat: add address to arbitrator format
2019-07-09 10:32:28 -04:00
44650d0adb
feat: arbitration approval UI ( #358 )
...
* feat: arbitration approval UI
* feat: display number of pending requests (#359 )
2019-07-09 10:12:55 -04:00
8808fb7f56
feat: show no arbitrator warning in offer list ( #360 )
2019-07-09 10:08:40 -04:00
138cb26065
Merge pull request #357 from status-im/fix/seller-profile-no-arbiter
...
Enable sellers to check arbiters and their own profile as soon as they have a license
2019-07-09 09:22:53 -04:00
29dae1df5d
add KyberNetworkProxy mock; add ropsten & rinkey addresses for KyberNetworkProxy
2019-07-08 21:13:44 -04:00
fe5d2a4373
feat: add warning if you don't have approved arbitrators
2019-07-08 15:27:21 -04:00
0498a4739e
fix: show profile with just a license
2019-07-08 15:27:17 -04:00
0d9c182542
Merge pull request #354 from status-im/feat/add-tx-hash-everywhere
...
feat: add txHash to license buys
2019-07-08 13:56:13 -04:00
f3a9b0bd4b
fix tests
2019-07-08 10:00:02 -04:00
a0445ec963
Merge pull request #349 from status-im/feat/poll-balance-arbitrator
...
feat: poll balance for arbitrator license
2019-07-08 09:55:31 -04:00
4ddf28b27b
fix tests
2019-07-08 09:10:15 -04:00
0773fb9355
feat: Accepting / Denying all requests for arbitrators ( #353 )
...
* feature changes + toggle button
* feat: seller management link and enable/disable accepting all arbitrator requests
2019-07-05 12:40:27 -04:00
7cf1fccf05
feat: add txHash to license buys
2019-07-05 10:57:34 -04:00
7101e9c85c
Merge branch 'master' into feat/poll-balance-arbitrator
2019-07-05 10:05:18 -04:00
c2ad49edab
Merge pull request #352 from status-im/feat/arbitration-selection
...
feat: arbitration selection
2019-07-05 09:02:16 -04:00
af5ea83969
feat: sellers' arbitration selection screen ( #351 )
...
* feat: show no arbitrator warning
* feat: sellers' arbitration selection screen
2019-07-05 09:00:44 -04:00
438c0d5317
feat: show no arbitrator warning ( #345 )
...
* feat: show no arbitrator warning
* feat: miscellaneous stuff (#350 )
* adding selective arbitrator
* feat: arbitrator management button
* changing request process to state machine
* Setting initial user to empty, to avoid loading incorrect data if addressToUser is used with an unknown user
* fix: code review
* fix: tests
2019-07-05 09:00:44 -04:00
285cdba4db
feat: allow offer creation with no arbitrators
2019-07-05 08:53:32 -04:00
2b3ac0569b
feat: indexing event parameters
2019-07-05 08:53:32 -04:00
f390c74599
Made arbitration license inherit from license, and also allow arbitratorless offers (will display without a warning on the ui) ( #343 )
2019-07-05 08:53:32 -04:00
9c031136ee
add: arbitration selections checks, fixes, clean up ( #337 )
...
* add: ArbitratorLicense
* add: ArbitratorLicense struct
* wip: change to arbitratorLicense
* add: buyLicense
* add: acceptSeller
* add: request arbitrator flow
* add: modifications toarbitrator licensing
* wip: comment out assert in tests, needs to be fixed later
* wip: pr modifications
* fix: buyLicense functon
* add: reject/cancel request
* add: changeAcceptAny
* add: checks
* wip: arbitrator permission checks
* fix: clean up
* add: permissions and checks
* fix: logic errors
2019-07-05 08:53:32 -04:00
430a9cf22a
add: Arbitrator licensing and seller management ( #324 )
...
* add: ArbitratorLicense
* add: ArbitratorLicense struct
* wip: change to arbitratorLicense
* add: buyLicense
* add: acceptSeller
* add: request arbitrator flow
* add: modifications toarbitrator licensing
* wip: comment out assert in tests, needs to be fixed later
* wip: pr modifications
* fix: buyLicense functon
* add: reject/cancel request
* add: changeAcceptAny
2019-07-05 08:53:32 -04:00
d8236f4a70
fix: disable updating if the contact code is not valid ( #348 )
2019-07-05 08:52:23 -04:00
7c8c9ba9e8
Improve viewing offers for which you are the arbitrator ( #347 )
...
* feat: show a tooltip on offers you can't buy
* feat: show which offer is arbiter and only show tooltip on disabled
2019-07-05 08:48:07 -04:00
7c2b279047
fix: approval of tokens ( #346 )
...
* fix: approval of tokens
* use toTokenDecimals instead of toWei
2019-07-05 08:47:54 -04:00
0e8a898bce
feat: poll balance for arbitrator license
2019-07-04 15:14:05 -04:00
b1c58836ca
feat: documentation and code format ( #342 )
...
* feat: documentation and code format
* fix: code review
2019-07-03 14:00:13 -04:00
d81ab596ca
fix: removing warnings (pt. 1) ( #341 )
2019-07-02 15:14:46 -04:00
ac289bf0b0
refactors: createAndFund, removing tradeAmount from fund() and displaying SNT offers when user does not have enough ETH ( #338 )
...
* removed unneeded contracts
* added createAndFund back, and removed tradeAmount from fund()
* feat: small refactors
* updated tests
* ropsten contracts update
* displaying SNT offers, and removing references to tradeAmount
2019-07-02 15:12:48 -04:00
3fec461ec8
fix: remove extra transfer to reduce gas costs ( #339 )
...
* fix: remove extra transfer to reduce gas costs
* fix: moved value verification inside _payFee
2019-07-02 15:02:40 -04:00
bf1a0dd444
Merge pull request #335 from status-im/fix/trade-token-refresh
...
fix(network-reducer): fix updating the balance and not override
2019-07-02 10:09:14 -04:00
13ec57df46
feat: make the escrow contract upgradable ( #332 )
...
* feat: updating contracts with learnings from multiple instances experiment
* feat: update tests
* fix: contract configuration and function name
* feat: adding upgradability
* feat: adding upgrade tests, splitting arbitration tests from escrow_spec.js
* feat: update fund signature in approve and call
* feat: prefix internal functions, add management functions and rename license var
* feat: add approveAndCall test
* fix: merge error
* feat: UI changes for upgradable escrow (#336 )
* feat: updating contracts with learnings from multiple instances experiment
* fix: limit use of init function
* fix: updated tests and ropsten config
* feat: update provider and escrow to use proxy and relay
* feat: removing leftover from rebase
* fix: code review
2019-06-28 15:54:50 -04:00
35d2f3528c
Merge pull request #333 from status-im/fix/token-diff
...
fix(escrow-detail): use only two decimals to calculate the diff
2019-06-28 13:48:17 -04:00
af778d5469
Merge pull request #334 from status-im/fix/open-trade-fail-reset
...
fix(open-trade): reset state when exiting an open trade failure
2019-06-28 13:33:01 -04:00
648452da5f
fix(network-reducer): fix updating the balance and not override
2019-06-28 13:32:30 -04:00
Iuri Matias
Jonathan Rainville
Richard Ramos
kin