Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/#1371 #1386

Merged
merged 6 commits into from
Nov 23, 2020
Merged

Feature/#1371 #1386

merged 6 commits into from
Nov 23, 2020

Conversation

Mi-Lan
Copy link
Contributor

@Mi-Lan Mi-Lan commented Nov 20, 2020

No description provided.

@Mi-Lan Mi-Lan added this to the Version 1.2.0 milestone Nov 20, 2020
@Mi-Lan Mi-Lan added this to In progress in Omen via automation Nov 20, 2020
@Mi-Lan Mi-Lan self-assigned this Nov 20, 2020
Copy link
Contributor

@kadenzipfel kadenzipfel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! Just a question and a small change

app/src/services/cpk.ts Outdated Show resolved Hide resolved
Omen automation moved this from In progress to Review in progress Nov 20, 2020
Omen automation moved this from Review in progress to Reviewer approved Nov 20, 2020
@pimato pimato merged commit e4e6842 into verification Nov 23, 2020
Omen automation moved this from Reviewer approved to Done Nov 23, 2020
@pimato pimato deleted the feature/#1371 branch November 23, 2020 22:28
Mi-Lan added a commit that referenced this pull request Nov 27, 2020
* wip: implement basic market card

* add description

* fix: radio button behavior

* fix: missing fields in query

* fix: vulnerable links without noopener noreferrer

* feat: display submission information

* move component to new design

* display verification tab

* handle every verification state

* remove placeholders

* fix styling and add icons

* refactor: extract kleros curation logic to hook

* add kleros verification links to curate

* feat: update market details

* fix: update rinkeby contract and styling

* fix: badge link and curate actions

* revert misdeleted yarn.lock

* fix: add missing dependency

* fix: linting and prettier

* style: sort props alphabetically

* fix: yarn file

* fix: prop sorting rule inconsistency

* fix: implement review suggestions

* fix: conflicts with upstream

* fix: duplicated declarations and fix conflicts

* fix: use original verified badge

* fix: time remaining when waiting execution

* fix: use local listing criteria file

* fix: use new loading flow design

* fix: styling and option selection behavior

* fix: styling issues and missing icon

* feat: update UI on item status change

* fix: radio button styling

* fix: styling and behavior

* fix: styling and missing event listener

* feat: submit for validation from omen UI

* fix: change on kleros icon breaking UI

* refactor: styling and remove useless variables

* fix: missing dependency

* refactor: remove unused variable

* fix: incorrect dependency config

* fix: add id to kleros icon

* Replace MarketBottomNavButton component

* back button now goes to main page (#1348)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* Fix/#1341 (#1355)

* started solving

* consolidated iconTick and refactored code to fit needs

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* style changes to the challenge section (#1359)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* added hyperlink for the verified on the kleros curation (#1370)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* changed size of icon and border only shown when not active (#1367)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* added verified remove section (#1364)

* added verified remove section

* mistype fixed

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* changed margin of description to 20px (#1368)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* verify shown only for open markets (#1350)

* verify shown only for open markets

* prettier additions

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* changed location of exported styled components (#1357)

* changed location of exported styled components

* changed location of exports

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* updated button so that they have outline styling instaed of secondary (#1381)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* changed so that ETH is bolded for not verified market (#1379)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* changed styles of verification process icons (#1374)

* changed styles of verification process icons

* updated logo for pending markets

* updated so that whitespace is not clickable

* added back the html links instead of programtic ones

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* updated radioButtonWrapper (#1382)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* Feature/#1371 (#1386)

* intial commit

* work in progress

* updated kleros curation so that it has modal and also added reqeust verification to cpk

* added types

* updated verificationCheker and changes from code review

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* changed color of challengeable market eth (#1394)

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* Fix/#1339 consolidate spinners (#1395)

* consolidated spinners and changed structure a bit

* deleted unsused svg-s and updated title

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* update time remaining (#1397)

* button styling seems to be overwritten (#1399)

* button styling seems to be overwritten

* fixed button for remove market

Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>

* deleted unused button updated constants file and deleted env example

Co-authored-by: mtsalenc <mtsalenc@gmail.com>
Co-authored-by: Kaden Zipfel <kaden.zipfel@hotmail.com>
Co-authored-by: Milan Rasovic <33226956+Mi-Lan@users.noreply.github.com>
Co-authored-by: Milan Rasovic <ezo@Milans-MacBook-Pro.local>
Co-authored-by: hexyls <hexyls@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Omen
  
Done
Development

Successfully merging this pull request may close these issues.

Use transaction modal for showing user the state of the transaction similar to creating a market
4 participants