Merge pull request #748 from gnosis/develop

Bump release `v0.3.0`

.env.example

@@ -3,16 +3,11 @@ REACT_APP_INFURA_ID=INFURA_ID
 REACT_APP_DEFAULT_NETWORK_ID=1
 
 REACT_APP_CTE_GRAPH_HTTP_MAINNET='https://api.thegraph.com/subgraphs/name/cag/hg'
-REACT_APP_CTE_GRAPH_WS_MAINNET='wss://api.thegraph.com/subgraphs/name/cag/hg'
 REACT_APP_CTE_GRAPH_HTTP_RINKEBY='https://api.thegraph.com/subgraphs/name/cag/hg-rinkeby'
-REACT_APP_CTE_GRAPH_WS_RINKEBY='wss://api.thegraph.com/subgraphs/name/cag/hg-rinkeby'
 REACT_APP_CTE_GRAPH_HTTP_GANACHE='http://localhost:8000/subgraphs/name/gnosis/hg'
-REACT_APP_CTE_GRAPH_WS_GANACHE='ws://localhost:8001/subgraphs/name/gnosis/hg'
 
 REACT_APP_OMEN_GRAPH_HTTP_MAINNET='https://api.thegraph.com/subgraphs/name/protofire/omen'
-REACT_APP_OMEN_GRAPH_WS_MAINNET='wss://api.thegraph.com/subgraphs/name/protofire/omen'
 REACT_APP_OMEN_GRAPH_HTTP_RINKEBY='https://api.thegraph.com/subgraphs/name/protofire/omen-rinkeby'
-REACT_APP_OMEN_GRAPH_WS_RINKEBY='wss://api.thegraph.com/subgraphs/name/protofire/omen-rinkeby'
 
 REACT_APP_EARLIEST_MAINNET_BLOCK_TO_CHECK=1
 REACT_APP_EARLIEST_RINKEBY_BLOCK_TO_CHECK=1
@@ -50,3 +45,11 @@ REACT_APP_REALITY_TIMEOUT=86400
 # Min and max outcomes allowed
 REACT_APP_MIN_OUTCOMES_ALLOWED=2
 REACT_APP_MAX_OUTCOMES_ALLOWED=256
+
+REACT_APP_OMEN_URL_DAPP='https://omen.eth.link'
+
+# icon endpoint
+REACT_APP_ICON_ENDPOINT='https://gnosis-safe-token-logos.s3.amazonaws.com/{}.png'
+
+# use cpk or not
+REACT_APP_USE_CPK='false'

.eslintrc

@@ -71,7 +71,7 @@
       "newlines-between": "always",
       "pathGroups": [
         {"group": "builtin", "pattern": "react", "position": "before"},
-        {"group": "external", "pattern": "{react-router,lodash.clonedeep,moment,apollo-link-retry,apollo-cache-inmemory,apollo-client,apollo-link,apollo-link-http,apollo-link-logger,apollo-link-ws,apollo-utilities,lodash.orderby,react-blockies,lodash.uniqby,@realitio/realitio-lib/formatters/question,@realitio/realitio-lib/formatters/template,@gnosis.pm/conditional-tokens-contracts/utils/id-helpers,@walletconnect/web3-provide,web3modal,polished,react-modal,big-number-input,react-dom/test-utils,@apollo/react-hooks,@react-hook/debounce,react-data-table-component,@apollo/react-testing,@testing-library/dom,@testing-library/user-event,@testing-library/react,react-hook-form,styled-components,ethers/utils,react-dom,react-router-dom,logdown,ethers,ethers/providers,moment-timezone,web3-utils,graphql-tag}", "position": "before"}
+        {"group": "external", "pattern": "{lodash.debounce,lodash.uniqby,react-router,lodash.clonedeep,moment,apollo-link-retry,apollo-cache-inmemory,apollo-client,apollo-link,apollo-link-http,apollo-link-logger,apollo-link-ws,apollo-utilities,lodash.orderby,react-blockies,lodash.uniqby,@realitio/realitio-lib/formatters/question,@realitio/realitio-lib/formatters/template,@gnosis.pm/conditional-tokens-contracts/utils/id-helpers,@walletconnect/web3-provide,web3modal,polished,react-modal,big-number-input,react-dom/test-utils,@apollo/react-hooks,@react-hook/debounce,react-data-table-component,@apollo/react-testing,@testing-library/dom,@testing-library/user-event,@testing-library/react,react-hook-form,styled-components,ethers/utils,react-dom,react-router-dom,logdown,ethers,ethers/providers,moment-timezone,web3-utils,graphql-tag}", "position": "before"}
       ],
       "pathGroupsExcludedImportTypes": ["builtin"]
     }],

.travis.yml

@@ -1,7 +1,7 @@
 if: (branch = develop) OR (branch = master) OR (type = pull_request) OR (tag IS present)
 language: node_js
 node_js:
-  - 'stable'
+  - 'lts/*'
 cache: 'yarn'
 env:
   global:

RELEASES.md

@@ -1,86 +1,125 @@
+Version 0.3.0 (2020-12-03)
+==========================
+
+- Fix regression in redeem #734
+- Question/Outcomes/Category is not displayed in an Omen condition details when create in it the CTE #718
+- Do not apply 3 sec of a delay when a date field is filled in with a correct value #711
+- Enable 'Clear' button as soon as a value appears in the Date filter #706
+- Split position: The app is crashed when switch to the Position option #705
+- T[here is no link to Omen markets when create an Omen condition #703
+- Lists filter results are not reset after connecting to a wallet  #702
+- [UX / UI] Remove unnecessary "Close button" #696
+- Redeem is not working (positions are not zero out and no tokens are returned to a wallet) #693
+- Cannot resolve an Omen condition which was created by a currently connected wallet #692
+- Full fetch thegraph for conditions #690
+- Typos in the Terms/Cookie policy pages  #687
+- Container is too big when there is no positions for a condition on a condition details page #674
+- Condition Id field is cleared out when select a position to merge with for a position with 2 conditions #673
+- UI issues with Cookie/Privacy Policy pages #672
+- UI issues with Terms and Conditions page #671
+- Positions list: 2nd search query does not appear when filter/search for a position  #662
+- UI - '...date is invalid' appears as soon as start typing into a date filter #661
+- It may take up to 10 sec until filter results are loaded in the select position section#660
+- [Staging+Prod] cDAI icon is blinking when open Collateral filter in the Postitions list #577
+- [FE] Add spinner to Outcomes table in "Report Payouts" #596
+- Filter by collateral: loader is not always displayed when switch between collaterals in the filter #604
+- Rounding issue in the merge positions preview #613
+- Report payouts: not to show 'At least one payout must be positive' warning until clear out all the payouts fields #615
+- No question text for an Omen condition when there is no relevant Omen markets #622
+- UI - wrap text by words in the outcomes section on a position details page #626
+- Conditions filters: 'Go' arrow is enabled when empty value is displayed in the 'Number of Outcomes' fields #630
+- Reality.eth is not displayed in the Oracles pop-up when there are 2 oracles for a position #633
+- Empty The reported array is displayed after successful report payouts #642
+- UI: selected position/condition is not highlighted in the select position/condition sections  #649
+- Report button should be enabled and call connection pop-up on the Report payouts page #652
+- 'Use Position Balance ($0.00)' should be disabled when no positions to merge are selected #653
+- 'Use Wallet Balance' remains to display wallet amount of DAI when switch to 'Position' option #654
+- 'Merge with' section shows positions with 0 balance to merge  #657
+- Previously selected option in filter dropdowns remain to be highlighted after Clear Filters #659
+
 Version 0.2.0 (2020-11-10)
 ==========================
 
-- [Confirmation message to delete outcomes is not visible when there too many outcomes in the partition section.][575]
-- [UI - CONDITION\'S SPLIT POSITIONS section has a double bottom border when it is empty.][576]
-- [Cannot merge 3 or more positions of a deeper level.][484]
-- [\[Prod/Dev\] 404 error appears when open condition details from a position detail (when there are \>1 conditions).][580]
-- [\[FE\] Impossible to merge positions of a \'deeper\' level (collateral USDC).][362]
-- [\[FE\] Balance of a position is not cleared out after a merge.][365]
-- [\[FE\] Redeem positions: Incorrect field\'s values for the RESOLVED CONDITION ID/ REDEEMED POSITION PREVIEW.][313]
-- [\[UI/UX\] Mobile version: UI issues to fix and discuss.][330]
-- [Select positions list is blinking when search for a position.][396]
-- [\[FE\] Select position list blinking / flashing.][391]
-- [UI: Warning pop-up with an error \"expands\" Select position pop-up.][388]
-- [\[FE\] Crash when splitting from a condition with many outcomes.][490]
-- [Given 2 positions A and B\|C their merge preview is wrong.][487]
-- [\[FE\] Crash when splitting from a condition with more than 31 outcomes.][261]
-- [When disconnected, the app use default Rinkeby for the Network: it causes errors with filtering.][555]
-- [Nothing happens when click on the Ok button on the \'Are you sure you want to leave this page?\' pop-up when navigate to the same page.][552]
-- [Empty Condition Id Preview section appears when prepare an omen condition as a not logged in user.][559]
-- [Impossible to open a duplicated conditions by the left click on the Duplicated Condition warning.][522]
-- [Prepare condition: \'working..\' pop-up hangs when connect a wallet after pressing on the \'Prepare\' button.][561]
-- [Redeem Positions heading is missing.][545]
-- [Disable sorting by Reporter/Oracle in the Conditions list.][562]
-- [\[FE\] Improve pagination in the condition list section.][123]
-- [Display oracle = realit.io for a position when it belongs to an omen condition.][538]
-- [Link to oracle if it is known.][540]
-- [Omen Condition: Prepare button remains disabled until open and reselect a category.][486]
-- [Collateral symbol search: Add a possibility to search by all the words that start with a symbol.][524]
-- [Positions list: cDAI icon is blinking when open Collateral filter in mainnet.][525]
-- [Add a link to the docs.][548]
-- [Render question text, rather than ID, for Omen/Reality.eth conditions and positions.][541]
-- [\[FE\] Implement a warning pop-up to prevent data loss when leaving a page.][211]
-- [UI/UX: issues with search/filters on the Positions and Conditions pages.][440]
-- [UI issues with Positions/Conditions grids.][499]
-- [\[FE\] Split Position Result Modal window appears when transaction is failed.][276]
-- [Add a possibility to search by a custom collateral symbol.][504]
+- Confirmation message to delete outcomes is not visible when there too many outcomes in the partition section #575
+- UI - CONDITION\'S SPLIT POSITIONS section has a double bottom border when it is empty #576
+- Cannot merge 3 or more positions of a deeper level #484
+- [Prod/Dev] 404 error appears when open condition details from a position detail (when there are \>1 conditions) #580
+- [FE] Impossible to merge positions of a \'deeper\' level (collateral USDC) #362
+- [FE] Balance of a position is not cleared out after a merge #365
+- [FE] Redeem positions: Incorrect field\'s values for the RESOLVED CONDITION ID/ REDEEMED POSITION PREVIEW #313
+- [UI/UX] Mobile version: UI issues to fix and discuss #330
+- Select positions list is blinking when search for a position #396
+- [FE] Select position list blinking / flashing #391
+- UI: Warning pop-up with an error \"expands\" Select position pop-up #388
+- [FE] Crash when splitting from a condition with many outcomes #490
+- Given 2 positions A and B\|C their merge preview is wrong #487
+- [FE] Crash when splitting from a condition with more than 31 outcomes #261
+- When disconnected, the app use default Rinkeby for the Network: it causes errors with filtering #555
+- Nothing happens when click on the Ok button on the \'Are you sure you want to leave this page?\' pop-up when navigate to the same page #552
+- Empty Condition Id Preview section appears when prepare an omen condition as a not logged in user #559
+- Impossible to open a duplicated conditions by the left click on the Duplicated Condition warning #522
+- Prepare condition: \'working..\' pop-up hangs when connect a wallet after pressing on the \'Prepare\' button #561
+- Redeem Positions heading is missing #545
+- Disable sorting by Reporter/Oracle in the Conditions list #562
+- [FE] Improve pagination in the condition list section #123
+- Display oracle = realit.io for a position when it belongs to an omen condition #538
+- Link to oracle if it is known #540
+- Omen Condition: Prepare button remains disabled until open and reselect a category #486
+- Collateral symbol search: Add a possibility to search by all the words that start with a symbol #524
+- Positions list: cDAI icon is blinking when open Collateral filter in mainnet #525
+- Add a link to the docs #548
+- Render question text, rather than ID, for Omen/Reality.eth conditions and positions #541
+- [FE] Implement a warning pop-up to prevent data loss when leaving a page #211
+- UI/UX: issues with search/filters on the Positions and Conditions pages #440
+- UI issues with Positions/Conditions grids #499
+- [FE] Split Position Result Modal window appears when transaction is failed #276
+- Add a possibility to search by a custom collateral symbol #504
 
 Version 0.1.0 (2020-10-28)
 ==========================
 
 Position list, search, and filter features
 ------------------------------------------
-- [\[FE\] Position List Search Items, improvements for searching in the subgraph.][507]
-- [Positions list: Search query hags eternally when switch search options.][506]
-- [Positions/Conditions list: Pagination is not reset to the 1st page after filters applying.][505]
-- [Add a possibility to search by a custom collateral symbol.][504]
-- [Creation date: validation message is displayed when clear out any filter field.][503]
-- [\[FE\] Move \'Custom Token\' option to the bottom in the Collateral filter.][501]
-- [UI issues with Positions/Conditions grids.][499]
-- [UI: Custom collateral icons are loaded with a delay on Positions list.][496]
-- [Creation date filter: No validation message when From date to date (1 day difference).][481]
-- [\[FE\] Positions List Filters.][411]
-- [\[FE\] Positions List Search Items.][413]
+- [FE] Position List Search Items, improvements for searching in the subgraph #507
+- Positions list: Search query hags eternally when switch search options #506
+- Positions/Conditions list: Pagination is not reset to the 1st page after filters applying #505
+- Add a possibility to search by a custom collateral symbol #504
+- Creation date: validation message is displayed when clear out any filter field #503
+- [FE] Move \'Custom Token\' option to the bottom in the Collateral filter #501
+- UI issues with Positions/Conditions grids #499
+- UI: Custom collateral icons are loaded with a delay on Positions list #496
+- Creation date filter: No validation message when From date to date (1 day difference) #481
+- [FE] Positions List Filters #411
+- [FE] Positions List Search Items #413
 
 Condition list, search, and filter features
 -------------------------------------------
-- [\[FE\] Remove Kleros from the filters][475]
-- [\[FE\] Conditions list: Search returns no results when a creation date filter is filled with To=From date.][469]
-- [\[FE\] Search results are not refreshed when clear out values in the > \'Number of outcomes\' and \'Created date\' filters.][468]
-- [\[FE\] Search returns an odd GraphQL error when search by numbers.][467]
-- [\[FE\] Filters are not applied when the user connects.][460]
-- [\[UI / UX\] Column names overlap each other when filter is opened.][459]
-- [\[FE\] Disable report payout option when a condition is resolved.][458]
-- [\[FE\] Condition List Search Items, improvements for searching in the subgraph.][447]
-- [UI/UX: issues with search/filters on the Positions and Conditions pages.][440]
-- [\[FE - UI/UX\] New Search Feature.][403]
-- [\[FE - UI/UX\] New Filters Feature.][404]
+- [FE] Remove Kleros from the filters][475]
+- [FE] Conditions list: Search returns no results when a creation date filter is filled with To=From date #469
+- [FE] Search results are not refreshed when clear out values in the > \'Number of outcomes\' and \'Created date\' filters #468
+- [FE] Search returns an odd GraphQL error when search by numbers #467
+- [FE] Filters are not applied when the user connects #460
+- [UI / UX] Column names overlap each other when filter is opened #459
+- [FE] Disable report payout option when a condition is resolved #458
+- [FE] Condition List Search Items, improvements for searching in the subgraph #447
+- UI/UX: issues with search/filters on the Positions and Conditions pages #440
+- [FE - UI/UX] New Search Feature #403
+- [FE - UI/UX] New Filters Feature #404
 
 Split positions
 ---------------
-- [Increase a click area in the Split positions pop-up for navigation icon.][482]
-- [Change column title from in the Select Condition pop-up.][480]
+- Increase a click area in the Split positions pop-up for navigation icon #482
+- Change column title from in the Select Condition pop-up #480
 
 Prepare Condition
 -----------------
-- [\[FE\] Make Kleros the default arbitrator for Omen Conditions.][474]
-- [Resolved in Realit.io condition is displayed like an Open one in CTEAF app.][466]
-- [\[FE\] Edit / Remove outcomes is not working.][451]
-- [Prepare Omen condition: issues with the Resolution date field.][434]
+- [FE] Make Kleros the default arbitrator for Omen Conditions #474
+- Resolved in Realit.io condition is displayed like an Open one in CTEAF app #466
+- [FE] Edit / Remove outcomes is not working #451
+- Prepare Omen condition: issues with the Resolution date field #434
 
 Redeem Positions
 ----------------
 
-- [Redeem positions: select position pop-up hangs (eternally) when click on the Position field \>3 times.][398]
+- Redeem positions: select position pop-up hangs (eternally) when click on the Position field \>3 times #398
 

VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

package.json

@@ -1,15 +1,22 @@
 {
-  "name": "conditional-tokens-factory",
-  "version": "0.2.0",
+  "name": "conditional-tokens-explorer",
+  "version": "0.3.0",
   "private": true,
+  "engines": {
+    "node": ">=4.4.7 <=14.15.1"
+  },
   "dependencies": {
     "@apollo/react-hooks": "^3.1.5",
     "@apollo/react-testing": "^3.1.4",
     "@gnosis.pm/conditional-tokens-contracts": "^1.0.1",
     "@react-hook/debounce": "^3.0.0",
     "@realitio/realitio-lib": "^2.0.2",
+    "@testing-library/react-hooks": "^3.4.2",
     "@types/contract-proxy-kit": "^1.0.1",
+    "@types/lodash.debounce": "^4.0.6",
+    "@types/lodash.uniq": "^4.5.6",
     "@types/lodash.zipobject": "^4.1.6",
+    "@types/react-router-hash-link": "^1.2.1",
     "@uniswap/default-token-list": "^1.5.0",
     "@walletconnect/web3-provider": "^1.3.1",
     "apollo": "^2.28.3",
@@ -23,15 +30,17 @@
     "apollo-link-ws": "^1.0.20",
     "apollo-utilities": "^1.3.4",
     "bn.js": "^5.1.3",
-    "contract-proxy-kit": "^2.1.0",
+    "contract-proxy-kit": "^v2.2.0-alpha.3",
     "dotenv-flow": "^3.1.0",
     "ethers": "^4.0.47",
     "graphql": "^14.6.0",
     "graphql-tag": "^2.10.3",
     "husky": "^4.2.5",
     "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4.0.8",
     "lodash.isequal": "^4.5.0",
     "lodash.orderby": "^4.6.0",
+    "lodash.uniq": "^4.5.0",
     "lodash.uniqby": "^4.7.0",
     "lodash.zipobject": "^4.1.3",
     "logdown": "^3.3.1",
@@ -49,6 +58,7 @@
     "react-modal": "^3.11.2",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
+    "react-router-hash-link": "^2.2.2",
     "react-scripts": "^3.4.1",
     "react-tooltip": "^4.2.9",
     "sanitize.css": "^11.0.1",
@@ -127,7 +137,8 @@
     "eslint-plugin-react-hooks": "^4.1.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "lint-staged": "^10.2.6",
-    "prettier": "^2.0.5"
+    "prettier": "^2.0.5",
+    "react-test-renderer": "^16.13.1"
   },
   "resolutions": {
     "graphql": "^14.7.0"

src/components/buttons/ButtonDropdownCircle/index.tsx

@@ -23,6 +23,12 @@ const Wrapper = styled.button`
   user-select: none;
   width: 28px;
 
+  svg {
+    .fill {
+      fill: ${(props) => props.theme.colors.mediumGrey};
+    }
+  }
+
   &:hover {
     border-color: ${(props) => props.theme.colors.primary};
 

src/components/common/CenteredCard/index.tsx

@@ -29,8 +29,8 @@ export const CenteredCard: React.FC<FormCardProps> = (props) => {
   return (
     <Wrapper {...restProps}>
       <>
-        {children}
         {dropdown && <DropdownContainer>{dropdown}</DropdownContainer>}
+        {children}
       </>
     </Wrapper>
   )