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.

Sign up for GitHub

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

Jump to bottom

Development #500

Merged
merged 10 commits into from
Sep 9, 2018
Merged

Development #500

merged 10 commits into from
Sep 9, 2018

Conversation

mmv08
Copy link
Contributor

@mmv08 mmv08 commented Sep 9, 2018

Description

  • Example Content

Which Tickets does my PR fix? (Put in title too)

  • Fixes task/PM-123

Which PRs are linked to my PR?

  • task/PM-123

Which side effects could my PR have?

  • Example Content

Which Steps did I take to verify my PR?

Case 1

  • Example Content

Case 2

  • Example Content

Background Information

  • Example Content

Configuration Entries

/staging/interface.config

{
  "feature": {
    "enabled": false,
  }
}

/olympia/staging/interface.config

{
  "feature": {
    "enabled" true,
  }
}

@mmv08 mmv08 merged commit afef240 into master Sep 9, 2018
mmv08 added a commit that referenced this pull request Sep 13, 2018
@mmv08
New mainnet release without legal docs (#503)
8b7a175 
* Fix multiple exports duplicate name PM-616

* Remove old selectors PM-616

* MarketDetails wip PM-616

* BUG PM-681: When user logs out from metamask, mainnet address and reward info are still shown (#416)

* Add a check for account PM-681

* Set mainnet address to null if account is not present PM-681

* Only update the address if tournament is enabled

* MarketDetails wip PM-616

* Fix token symbols

* Bug Hotfix: Error on unregistered accounts viewing the site (#417)

* fix rewards by making sure users list exists

* Check for invalid response in fetchTournamentUserData

* Change whitelist (#419)

* Fix expandable show conditions PM-616

* Remove unused import PM-616

* Fix buySharesForm outcome selection PM-616

* Disable reward claiming for demo

* MarketBuySharesForm NaN bug wip
PM-616

* Filter markets with wrong description

* BuySharesForm wip

* add updateMarket action pM-616-

* fix failing test PM-616

* add .babelrc change to display unresolved imports

* Update packages & eslint fixes PM-616

* Bug PM-685: Implement Localstorage/Sessionstorage Middlewares as generic middleware (#420)

* generic storage middleware

* remove old stuff

* remove console.log

* implement accountsettings, saving wallet/account dependendant information that will be kept until the next version

* disable claiming on staging

* fix imports

* fix imports

* add RequestTrades/SharesForAccount actions, add marketgraph reducer PM-616

* Tests fix PM-616

* Fix request trades/shares actions PM-616

* Add getMarketShares selector PM-616

* Remove unused propType PM-616

* Hide demo markets

* Task PM-648 Allow Configuration of required legal documents (#421)

* refactor legal compliance document requirements

* fix problem on register wallet

* fix remaining bugs to determine if tos have been accepted

* update config

* add localstorage load again

* fix build

* fix build

* remove log

* Update packages, fix scalar market record, shares enhance WIP PM-616

* hotfix: fix register wallet address

* wip fix jest

* Add upload-dir for mainnet, staging and olympia-staging

* hotfix: jest working again

* Add upload-dir to staging deploys

* Add upload-dir to staging deploys

* Fix sharesTable view PM-616

* Remove unneeded PropType PM-616

* Remove mainnetRegistry from scoreboard, fix failing tests PM-616

* Fix package-lock.json for CI PM-616

* Add npm cache

* fix warnings and unresolved imports

* Add npm cache

* Remove package-lock from gitignore

* Remove package-lock from gitignore

* Add releases deploy based on tags

* Bug/pm 692 (#423)

* Fix the condition for canInteract PM-692

* Remove unused import PM-692

* Task PM-656: Configuration at Runtime (#424)

* refactor configurations, implement config loader for browser

* fix builds, implement in webpack, implement prod build

* remove console.log

* fix build

* update clean command in package.json

* Fix .travis.yml

* Fix package-lock.json

* Remove upload_dir from .travis for olympia-qa

* Revert "Fix package-lock.json"

This reverts commit 95d8f75.

* Revert "Revert "Fix package-lock.json""

This reverts commit 1b51c0c.

* Revert "Remove upload_dir from .travis for olympia-qa"

This reverts commit b1d0393.

* Task PM-667: Update legal documents (#425)

* Add legal documents, fix LegalCompliance PM-616

* Fix appContainer"
"

* PR fixes PM-667

* fix tokenSymbols selector, remove unused imports/exports, fix load_localstorage reducer PM-616

* Fix margin PM-691 (#426)

* Fix marketGraph PM-693 (#427)

* Add isMarketResolvedOrClosed helper function pm-616

* Update packages, fix hasAcceptedTaC selector PM-702 (#428)

* Task PM-699 & PM-700: Dappcon config preparations (#429)

* Config fixes PM-699

* Eslint fixes PM-699 PM-700

* Codestyle fixes PM-699 PM-700

* Fix display of 0 rewards PM-699

* Task PM-695: Remove "My Markets" filter (#430)

* Remove my markets filter

* PM-695 remove unused filters

* Task PM-696: Change order of links in header (#431)

* Change order of links in header PM-696

* Eslint fixes PM-696

* Fix ToS text PM-696

* Task PM-697: Remove percentage from scalar outcome selection (#432)

* Remove percentage from scalar outcome selection PM-697

* Eslint fixes PM-697

* Eslint fixes PM-697

* Typograpy fix PM-704 (#433)

* Update registerWallet screenshot in game guide PM-703 (#434)

* Hide market 0xb6cd050544b07355f0f55a3123c1832d50ed4885

* Bug PM-686: Fix countdown (#435)

* Update countdown component PM-686

* PropType fix PM-686

* Bug PM-687: Fix inconsistency between predicted scalar outcomes (#436)

* calculation fixes PM-687

* Style fixes PM-687

* Bug PM-705: Registration fixes (#437)

* Fix order of setting gnosis instance, use InteractionButton in LegalCompliance, add options to disable checks in interaction button PM-705

* Eslint fixes PM-705

* Eslint fixes

* Eslint fixes PM-705

* MarketGraph fixes PM-709" (#439)

* Fetch data after account change PM-706 (#438)

* fix define

* fix lint

* Switch network modal fix PM-616

* Task PM-688: Mandatory Fields in Buy/Sell (#440)

* improve buy section

* improve sell section

* Task: Webpack/SCSS Import Cleanup (#441)

* search + replace ../../ notatation with ~style

* add alias to prod webpack config

* Storage middleware fixes pm-616

* Share sell view refactor PM-616

* Codestyle/eslint fixes PM-616

* My Trades wip commit PM-616

* Wait for gnosis RO initialization PM-710 (#442)

* Add Lama to whitelist

* BUG PM-705: Registering account not intuitive (#443)

* Fix order of setting gnosis instance, use InteractionButton in LegalCompliance, add options to disable checks in interaction button PM-705

* Eslint fixes PM-705

* Eslint fixes

* Eslint fixes PM-705

* set pointerEvents to none for disabled button PM-705

* Fix Lama's address

* BUG PM-705: Registration not intuitive (#444)

* Fix order of setting gnosis instance, use InteractionButton in LegalCompliance, add options to disable checks in interaction button PM-705

* Eslint fixes PM-705

* Eslint fixes

* Eslint fixes PM-705

* set pointerEvents to none for disabled button PM-705

* Fix Lama's address

* Add balance watcher PM-705

* Build fix PM-705

* BUG PM-687: Predicted outcome is not consistent (#445)

* calculation fixes PM-687

* Style fixes PM-687

* Fix predicted outcome PM-687

* Remove unused imports/exports PM-687

* BUG PM-709: Add padding to bottom of the Y-Axis for scalar graph (#446)

* MarketGraph fixes PM-709"

* Add padding to Y-Axis PM-709

* BUG PM-712: User is registered after rejecting Metamask pop up (#447)

* Close the modal when it receives mainnet address, remove connectionTried, only rely on gnosisInitialized and gnosisROInitialized PM-712

* Fix tests PM-712

* Show a note about insufficient ETH in register mainnet address modal PM-713

* Revert "Show a note about insufficient ETH in register mainnet address modal PM-713"

This reverts commit 271d435.

* BUG PM-713: The interface does not notify the user that he has no ETH to register to the page (#448)

* Show a note about insufficient ETH in register mainnet address modal PM-713

* Codestyle fixes'

* BUG PM-709: Fix the market graph (#449)

* MarketGraph fixes PM-709"

* Add padding to Y-Axis PM-709

* Add padding to categorical graph PM-709

* Task PM-688: Add a mandatory field mark for outcome and investment box choice (#450)

* Fix tooltip for disabled button PM-688

* Eslint fixes PM-688

* hotfix interaction button

* Css hotfix

* BUG PM-687: Predicted outcome is not consistent (#451)

* calculation fixes PM-687

* Style fixes PM-687

* Fix predicted outcome PM-687

* Remove unused imports/exports PM-687

* Fix inconsistency between predicted outcomes PM-687

* Fetch balance immediately after component mounts without waiting for interval

* Change title

* Change rewardClaimAddress title PM-715 (#452)

* Update game guide for dappcon PM-723 (#453)

* Change component title case

* Configure production

* Add travis ci

* Update config.json

Use correct tradingdb URL for Dappcon prod

* Update ToS

* Update ToS (#455)

* Hotfix: tradingdb link and scoreboard table

* Hotfix: tradingdb link and scoreboard table

* Update config.json

* Update config.json

* Change registration contract

* Fix scalar slider for long units

* Fix staging configuration

* Add markdown to olympia

* Add commas for bounds

* Merge hotfixes from dappcon olympia to qa branch (#458)

* Olympia qa (#456)

* Update ToS

* Hotfix: tradingdb link and scoreboard table

* Update config.json

* Update config.json

* Change registration contract

* Fix scalar slider for long units

* Fix staging configuration

* Add markdown to olympia

* Olympia qa (#457)

* Update ToS

* Hotfix: tradingdb link and scoreboard table

* Update config.json

* Update config.json

* Change registration contract

* Fix scalar slider for long units

* Fix staging configuration

* Add markdown to olympia

* Add commas for bounds

* Update config.json

Address to lower case

* Hotfix: Update blocked word list

* PM-717 Buy shares form improvements, fix trade cost (#459)

* Convert resolution date to local to check if the market was closed, switch to 24-hr format PM-726 (#460)

* Tests fix PM-616

* Refactor trades PM-616"

* Remove unused imports PM-616

* Eslint fixes

* Eslint fixes

* Fix getMarketGraph selector PM-616

* MarketGraph WIP PM-616

* marketGraph finished PM-616

* Remove unused files PM-616

* Update packages PM-616

* fix scoreboard

* prepare merge

* Fix build, test env WIP

* fix jest

* Bring back window.__GNOSIS_CONFIG__ for jest

* fix conflicts

* fix conflicts

* Backmerge dAppcon Changes into Master/Mainnet (#461)

* update readme and package.json

* Task: Add Deploy/Build Steps for Olympia (#322)

* test build

* add deploy for olympia

* allow dynamic import syntax when running jest

* fix build

* fix build

* Update travis deployment script

* Task PM-589: Refactor transactions page (#321)

* Use oracle.outcome instead of inexisting oracle.winningOutcome PM-587

* Add transactions route PM-589"

* Move actions, reducers, selectors, middlewares to src/store PM-589

* Move transactions actions,store, selectors to transactions route PM-589

* Refactor modal reducer PM-589

* Refactor notifications reducer PM-589

* Fix reducer/selector for notifications

* Import fix

* Finish notifications reducer PM-589

* remove unused import PM-589

* TXs selector WIP PM-589

* Use arrays instead of maps in components PM-589

* Remove unused import in TransactionFloaterContainer PM-589

* remove console.logs in selectors, fix tx model PM-589

* Fix notifications proptype PM-589

* convert tx record to a js object pm-589

* Load/dump middlewares WIP PM-589

* root reducer fix PM-589

* Fix failing test PM-589

* fix typos PM-589

* Small codestyle fix PM-589

* fix deploy for olympia

* Task PM-602: Add ToS, PP and RDP to set mainnet address modal (#324)

* Add fields to set mainnet address modal PM-602

* Add redux-form proptypes PM-602

* Add PP, TOS, RDP to set mainnet address modal PM-602

* Fix bugs for non-tournament builds, move tos pp and rdp to assets/content PM-602

* fix config overwrites

* hotfix configuration issues

* Bug PM-588: Styling bugs (#326)

* Fix bunch of styling bugs PM-602

* Fix header styling

* Update packages PM-588

* Update packages

* Gnosisdb to tradingdb (#328)

* Development to master (#312)

* Refactor components to use CSS Modules (#307)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Task/use css modules everywhere (#311)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Load bootstrap table styles

* add lauti to whitelist

* fix casing for lautis address

* Update README.md

* Development to master (#319)

* Refactor components to use CSS Modules (#307)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Task/use css modules everywhere (#311)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Load bootstrap table styles

* Use oracle.outcome instead of inexisting oracle.winningOutcome PM-587 (#314)

* Task PM-586: Use CSS modules in components (#313)

* PM-586 Refactor TransactionFloater

* Transaction floater proptypes fixPM-586

* Fix NoMarkets component PM-586

* Remove react-immutable-proptypes in prod PM-586

* master to dev (#318)

* Development to master (#312)

* Refactor components to use CSS Modules (#307)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Task/use css modules everywhere (#311)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Load bootstrap table styles

* add lauti to whitelist

* fix casing for lautis address

* Update README.md

* Development (#320)

* Refactor components to use CSS Modules (#307)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Task/use css modules everywhere (#311)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Load bootstrap table styles

* Use oracle.outcome instead of inexisting oracle.winningOutcome PM-587 (#314)

* Task PM-586: Use CSS modules in components (#313)

* PM-586 Refactor TransactionFloater

* Transaction floater proptypes fixPM-586

* Fix NoMarkets component PM-586

* Remove react-immutable-proptypes in prod PM-586

* master to dev (#318)

* Development to master (#312)

* Refactor components to use CSS Modules (#307)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Task/use css modules everywhere (#311)

* Refactor App, backdropprovider, marketDetail, notifications

* Remove react-modal

* Refactor App container

* Fix eslint warnings

* Fix notification icon

* Update packages, fix animation

* MenuAccountDropdown css modules

* Trying to fix build

* Trying to fix build

* Configure bootstrap loader

* Add normalize.css

* Load bootstrap table styles

* add lauti to whitelist

* fix casing for lautis address

* Update README.md

* updated dockerfile and added docker-compose (#315)

* Fix icon name PM-595 (#317)

* Update README.md

* Task: Add Deploy/Build Steps for Olympia on Master (#323)

* add deploy for olympia

* fix build

* fix build

* fix deploy for olympia

* fix config overwrites

* hotfix configuration issues

* hotfix configuration issues

* Update config.json

* Update config.json

* Update config.json

* Update config.json

* Fix olympia dev config

* Task PM-612: Filter markets by collateral token address from config (#330)

* Filter markets by collateral token address from config PM-612

* Codestyle fix PM-612

* Use {} for collateral token config in case none is specified to prevent errors PM-612

* Update README.md

* Update README.md

* cherry-picked 2ac702

* cherry-picked 0d317d

* Bug PM-626: Fix loader position (#341)

* Fix loader position

* Fix failing test

* Fix overlap, fix expandable show condition, fix return sign PM-606 (#344)

* fix: display current env only when running first time, reduces spam during build, fix: marketlist test sometimes failed (#332) (#350)

* PM-445: implemented gas station for gasPrices (#333) (#351)

[BACKMERGE] PM-445: implemented gas station for gasPrices (#333)

* PM-618: Display WETH for Dashboard/Header (#334) (#352)

* [BACKMERGE] BUG pm-620: interaction without accepting tos (#353)

* PM-620: interaction not allowed anymore without accepting ToS (#336)

* Simplify show condition

* PM-608 do not destroy form state on unmount (#347)

* PM-617: copy /assets to dist/assets on build (#337) (#355)

* Bug/PM-619: Fix Marketlist Stats (#338) (#356)

* PM-619: fix display of marketlist stats

* PM-619: fix another test

* PM-619: disable env logging for tests

* Bug/PM-467: Add Loading Spinners to fields that show gas estimations (#339) (#357)

* PM-467: add loading spinner to gas cost display

* PM-467: fix tests to allow undefined as gascost/price values

* [BACKMERGE] /bug/fix profits and balance dashboard (#359)

* PM-618: Display WETH for Dashboard/Header (#334)

* Bug: Fix problems with collateralToken, allowing to enter contractName to use as collateralToken (#340)

* PM-618: Display WETH for Dashboard/Header

* Refactor collateralToken

* Implement ToS Acceptance localstorage load/save

* Update config for staging

* reset local config, update tests, fix collateralToken for all sources

* update all configs

* Fix failing imports & pass tests

* [BACKMERGE] Task: Disable Analytics, abstracted into config entries (#348) (#360)

* Task: Disable Analytics, abstracted into config entries (#348)

* implement loader pattern for analytics stuff, implemented ga as analytics loader

* reset default config

* more robust check for existing window.ga

* add optional chaining

* Tests fix

* Tests fix

* Task PM-629: Legal Updates, add Imprint (#358) (#361)

[BACKMERGE] Task PM-629: Legal Updates, add Imprint (#358)

* [BACKMERGE] Task PM-633 PM-634: Update packages, update TOS modal, update footer text (#363)

* Update packages, update TOS modal, update footer text PM-633 PM-634

* Remove console.log PM-633 PM-634

* [BACKMERGE] Bug PM-625: Interface goes blank after selecting market and then logging in (#365)

* Fix loader styles, fix undefined target network id reference PM-625

* Remove console.log pm-625

* pm-639: cherry pick to dev (#367)

* [BACKMERGE] BUG: Fix marketStatus utils to use moment's utc correctly (#368)

* Fix marketStatus utils to use moment's utc correctly

* Use isSameOrBefore for detecting ending soon market

* [BACKMERGE] Task PM-640: Update ToS and PP (#371)

* Update ToS and PP PM-640

* Fix PP PM-640

* Remove duplicate declaration (#372)

* Use abstraction from gnosis.js and not contract instance (#376)

* Save montserrat font locally PM-647 (#377)

* hotfix: Add Giacomo to whitelist for staging and dev

* Task PM-607: Notification icon is too close to the title (#378)

* Fix compilation: remove import of inexsting selector getCollateralToken PM-607

* Fix notifications styles PM-607

* Fix staging configuration PM-607

* Fix typo in tooltip PM-636

* Fix olympia configuration PM-627 (#382)

* Fix modal close button PM-614 (#381)

* TASK PM-616: Move contants to settings (#380)

* Move constants to settings PM-616

* Remove unused state PM-616

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Hotfix: Game guide export

* Hotfix: fix notification timeout constant name

* Bug PM-630: Header/Dashboard shows 0 OLY balance (#383)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Convert token balance to a string PM-630

* use tokenAmountString PM-630

* call .toString in api call PM-630

* Bug PM-630: Header/Dashboard shows 0 OLY balance (#383) (#384)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Convert token balance to a string PM-630

* use tokenAmountString PM-630

* call .toString in api call PM-630

* Fix the condition for showing reward claim box PM-653 (#385)

* Development (#386)

* Bug PM-630: Header/Dashboard shows 0 OLY balance (#383)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Convert token balance to a string PM-630

* use tokenAmountString PM-630

* call .toString in api call PM-630

* Fix the condition for showing reward claim box PM-653 (#385)

* HOTFIX: Update registration contract address

* Development (#388)

* Bug PM-630: Header/Dashboard shows 0 OLY balance (#383)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Convert token balance to a string PM-630

* use tokenAmountString PM-630

* call .toString in api call PM-630

* Fix the condition for showing reward claim box PM-653 (#385)

* HOTFIX: Update registration contract address

* Remove TXs page link from header PM-657 (#389)

* Task PM-660: Filter trades and shares by collateral token (#387)

* Filter trades and shares PM-660

* Make function argument's name more common PM-660

* Update packages PM-660

* Development to olympia-qa (#390)

* Bug PM-630: Header/Dashboard shows 0 OLY balance (#383)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Convert token balance to a string PM-630

* use tokenAmountString PM-630

* call .toString in api call PM-630

* Fix the condition for showing reward claim box PM-653 (#385)

* HOTFIX: Update registration contract address

* Remove TXs page link from header PM-657 (#389)

* Task PM-660: Filter trades and shares by collateral token (#387)

* Filter trades and shares PM-660

* Make function argument's name more common PM-660

* Update packages PM-660

* Fix header, fix buy shares validation PM-655 (#392)

* Bug PM-658: The rank number and the badge icon are not display in the Dashboard (#391)

* Fix display of badges PM-658

* Use decimalToText PM-658

* Development to olympia-qa (#393)

* Bug PM-630: Header/Dashboard shows 0 OLY balance (#383)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Convert token balance to a string PM-630

* use tokenAmountString PM-630

* call .toString in api call PM-630

* Fix the condition for showing reward claim box PM-653 (#385)

* HOTFIX: Update registration contract address

* Remove TXs page link from header PM-657 (#389)

* Task PM-660: Filter trades and shares by collateral token (#387)

* Filter trades and shares PM-660

* Make function argument's name more common PM-660

* Update packages PM-660

* Fix header, fix buy shares validation PM-655 (#392)

* Bug PM-658: The rank number and the badge icon are not display in the Dashboard (#391)

* Fix display of badges PM-658

* Use decimalToText PM-658

* BUG PM-628: Selling the min amount of tokens (0.000000000000000001) makes a transaction error in some markets (#394)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Set NODE_ENV in webpack.dev.config.js PM-628

* Add validation check for 0 earnings PM-628

* remove node_Env definition from defineplugin PM-628

* Fix webpack.dev.config.js codestlye PM-628

* Request tournament user data only if interface is configured as tournament PM-628

* Fix error message PM-628

* BUG PM-641: The user creates a new account and the interface does not ask to accept terms and conditions (#395)

* Add ToS, PP and RDP PM-641

* Small markup fix PM-641

* Remove 'Powered by gnosis' from logo PM-665 (#396)

* Development (#398)

* Bug PM-630: Header/Dashboard shows 0 OLY balance (#383)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Convert token balance to a string PM-630

* use tokenAmountString PM-630

* call .toString in api call PM-630

* Fix the condition for showing reward claim box PM-653 (#385)

* HOTFIX: Update registration contract address

* Remove TXs page link from header PM-657 (#389)

* Task PM-660: Filter trades and shares by collateral token (#387)

* Filter trades and shares PM-660

* Make function argument's name more common PM-660

* Update packages PM-660

* Fix header, fix buy shares validation PM-655 (#392)

* Bug PM-658: The rank number and the badge icon are not display in the Dashboard (#391)

* Fix display of badges PM-658

* Use decimalToText PM-658

* BUG PM-628: Selling the min amount of tokens (0.000000000000000001) makes a transaction error in some markets (#394)

* Configure olympia for testing PM-651

* Fix travis config PM-651

* Update build env script for olympia testing env PM-651

* Add missing bracket pm-651

* Add mini-css-extract-plugin PM-651

* Update bootstrap-loader settings PM-651

* Update webpack configuration PM-651

* Update whitelist PM-651

* Set NODE_ENV in webpack.dev.config.js PM-628

* Add validation check for 0 earnings PM-628

* remove node_Env definition from defineplugin PM-628

* Fix webpack.dev.config.js codestlye PM-628

* Request tournament user data only if interface is configured as tournament PM-628

* Fix error message PM-628

* BUG PM-641: The user creates a new account and the interface does not ask to accept terms and conditions (#395)

* Add ToS, PP and RDP PM-641

* Small markup fix PM-641

* Remove 'Powered by gnosis' from logo PM-665 (#396)

* Add WETH balance to ETH balance PM-666 (#397)

* Add markdown viewer to market's description PM-648 (#401)

* Task PM-668: Remove "Show Only My Markets" from Olympia and Mainnet (#400)

* Remove 'My markets' filter PM-668

* remove unused proptypes and imports PM-668

* Remove unused import PM-668

* Feature PM-410: Refactor Dashboard Route (#399)

* add metric section

* start marketoverview

* wip dashboard marketoverview using new selectors/actions

* css improvements, selector improvments, start user section

* wip dashboard trades/shares reducers

* add actions and builders

* wip before merge from dev

* improve reducer situation for routes, add functionality for registration enable/disable

* implement requestShares

* wip share section

* fix config db

* oops, fix merge

* refactor outcomebox, implement trades, fix share display

* fix annoying bug with collateralToken

* add trades/shares widgets

* finish metric sections, finish trades/shares section

* implement redeem winnings wip

* remove debugger

* pr fixes

* build fixes

* cleanup

* Update interface.config.json

Enable Reward Claiming as Test

* hotfix: duplicate declaration, wrong imports

* Update interface.config.json

* hotfix: fix reward claiming

* fix merge

* Bug fixes: Dashboard (#403)

* First try to fix dashboard

* Fix users selector

* Badge metric style fix

* Add 'isLoading' for tournament metrics

* implement empty state in user holding component (#404)

* remove old crap! 👌 (#405)

* fix merge conflicts

* merge fixes

* fix header currency symbol

* remove old test

* remove old test

* hotfix: missing selector

* hotfix: fix reward claim

* hotfix: lte to lt

* hotfix: gte to gt

* ux fixes claim reward, backdrop provider cleanup

* ux fixes claim reward, backdrop provider cleanup (#408)

* Add selector to check errors in form PM-628 (#409)

* Bug PM-672: Balance doesn't update after buy/sell/redeem (#407)

* Fetch collateral token balance after buying/selling

* fetch balance after redeeming winnings PM-672

* Eslint fixes PM-672

* Move requestCollateralTokenBalance to store/actions/blockchain PM-672

* Bugfix: Reward claiming (#411)

* Fix modal styles, fix config

* Reward claim fixes

* Enable reward claiming

* Bugfixes: Reward claiming (#412)

* Fix modal styles, fix config

* Reward claim fixes

* Enable reward claiming

* Fix proptypes and close modal after claim

* update configs (#410)

* Add a check for account PM-681 (#414)

* Bugfixes: Reward claiming and transactions (Incl. PM-682) (#413)

* Fix icon, fix localStorageDump

* Save rewards claimed ot state and use localstoragedump

* Reducer fix

* add old market stuff again

* Task: Use npm ci in travis (#415)

* Use npm ci in travis

* Travis fixes

* Use pm-js instead of deprecated gnosis-js

* Task: Use npm ci in travis (#415)

* Use npm ci in travis

* Travis fixes

* Use pm-js instead of deprecated gnosis-js

* fix unresolved imports

* fix linting errors and proptype errors

* Add requestMarket action, add getMarketById selector PM-616

* Fix multiple exports duplicate name PM-616

* Remove old selectors PM-616

* MarketDetails wip PM-616

* BUG PM-681: When user logs out from metamask, mainnet address and reward info are still shown (#416)

* Add a check for account PM-681

* Set mainnet address to null if account is not present PM-681

* Only update the address if tournament is enabled

* MarketDetails wip PM-616

* Fix token symbols

* Bug Hotfix: Error on unregistered accounts viewing the site (#417)

* fix rewards by making sure users list exists

* Check for invalid response in fetchTournamentUserData

* Change whitelist (#419)

* Fix expandable show conditions PM-616

* Remove unused import PM-616

* Fix buySharesForm outcome selection PM-616

* Disable reward claiming for demo

* MarketBuySharesForm NaN bug wip
PM-616

* Filter markets with wrong description

* BuySharesForm wip

* add updateMarket action pM-616-

* fix failing test PM-616

* add .babelrc change to display unresolved imports

* Update packages & eslint fixes PM-616

* Bug PM-685: Implement Localstorage/Sessionstorage Middlewares as generic middleware (#420)

* generic storage middleware

* remove old stuff

* remove console.log

* implement accountsettings, saving wallet/account dependendant information that will be kept until the next version

* disable claiming on staging

* fix imports

* fix imports

* add RequestTrades/SharesForAccount actions, add marketgraph reducer PM-616

* Tests fix PM-616

* Fix request trades/shares actions PM-616

* Add getMarketShares selector PM-616

* Remove unused propType PM-616

* Hide demo markets

* Task PM-648 Allow Configuration of required legal documents (#421)

* refactor legal compliance document requirements

* fix problem on register wallet

* fix remaining bugs to determine if tos have been accepted

* update config

* add localstorage load again

* fix build

* fix build

* remove log

* Update packages, fix scalar market record, shares enhance WIP PM-616

* hotfix: fix register wallet address

* wip fix jest

* Add upload-dir for mainnet, staging and olympia-staging

* hotfix: jest working again

* Fix sharesTable view PM-616

* Remove unneeded PropType PM-616

* Remove mainnetRegistry from scoreboard, fix failing tests PM-616

* Fix package-lock.json for CI PM-616

* fix warnings and unresolved imports

* Bug/pm 692 (#423)

* Fix the condition for canInteract PM-692

* Remove unused import PM-692

* Task PM-656: Configuration at Runtime (#424)

* refactor configurations, implement config loader for browser

* fix builds, implement in webpack, implement prod build

* remove console.log

* fix build

* update clean command in package.json

* Fix .travis.yml

* Fix package-lock.json

* Remove upload_dir from .travis for olympia-qa

* Revert "Fix package-lock.json"

This reverts commit 95d8f75.

* Revert "Revert "Fix package-lock.json""

This reverts commit 1b51c0c.

* Revert "Remove upload_dir from .travis for olympia-qa"

This reverts commit b1d0393.

* Task PM-667: Update legal documents (#425)

* Add legal documents, fix LegalCompliance PM-616

* Fix appContainer"
"

* PR fixes PM-667

* fix tokenSymbols selector, remove unused imports/exports, fix load_localstorage reducer PM-616

* Fix margin PM-691 (#426)

* Fix marketGraph PM-693 (#427)

* Add isMarketResolvedOrClosed helper function pm-616

* Update packages, fix hasAcceptedTaC selector PM-702 (#428)

* Task PM-699 & PM-700: Dappcon config preparations (#429)

* Config fixes PM-699

* Eslint fixes PM-699 PM-700

* Codestyle fixes PM-699 PM-700

* Fix display of 0 rewards PM-699

* Task PM-695: Remove "My Markets" filter (#430)

* Remove my markets filter

* PM-695 remove unused filters

* Task PM-696: Change order of links in header (#431)

* Change order of links in header PM-696

* Eslint fixes PM-696

* Fix ToS text PM-696

* Task PM-697: Remove percentage from scalar outcome selection (#432)

* Remove percentage from scalar outcome selection PM-697

* Eslint fixes PM-697

* Eslint fixes PM-697

* fix define

* fix lint

* Switch network modal fix PM-616

* Task: Webpack/SCSS Import Cleanup (#441)

* search + replace ../../ notatation with ~style

* add alias to prod webpack config

* Storage middleware fixes pm-616

* Share sell view refactor PM-616

* Codestyle/eslint fixes PM-616

* My Trades wip commit PM-616

* Tests fix PM-616

* Refactor trades PM-616"

* Remove unused imports PM-616

* Eslint fixes

* Eslint fixes

* Fix getMarketGraph selector PM-616

* MarketGraph WIP PM-616

* marketGraph finished PM-616

* Remove unused files PM-616

* Update packages PM-616

* fix scoreboard

* prepare merge

* Fix build, test env WIP

* fix jest

* Bring back window.__GNOSIS_CONFIG__ for jest

* fix conflicts

* fix conflicts

* oops

* fix more conflicts

* fix more more conflicts

* fix remaining issues, remove console log, fix tests, smoketest

* fix build, fix testnet config to be mainnet config for now

* remove connectBlockchain line

* Set title from config PM-731 (#463)

* Set title from config PM-731

* Change title when App is mounted PM-731

* Configure titles PM-731

* hotfix crash

* Html hotfix

* Task PM-735: Rename .mod.scss to .scss and remove loader for .mod.scss (#465)

* rename all scss files and imports PM-735

* Fix bootstrap and tooltip styles with css modules

* Fix prod configuration PM-735

* Fix .bootstraprc

* Development (#467)

* Set title from config PM-731 (#463)

* Set title from config PM-731

* Change title when App is mounted PM-731

* Configure titles PM-731

* hotfix crash

* Html hotfix

* Task PM-735: Rename .mod.scss to .scss and remove loader for .mod.scss (#465)

* rename all scss files and imports PM-735

* Fix bootstrap and tooltip styles with css modules

* Fix prod configuration PM-735

* Fix .bootstraprc

* Remove dappcon-olympia-release from .env_build script

* Fix prod build

* Task: Fix Footer, implement "fileName" config param, move footer to assets/content (#466)

* implement fileName option for footer loading, rename files, move files for easier webpack config

* fix linebreak on footer text, change styling slightly

* tiny header fix

* remove upload_dir from travis

* Bring back upload_dir

* Hotfix: footer text

* Change AWS security credentials

* Change AWS security credentials

* Import scoreboard's style PM-738 (#469)

* Fix token amount selector PM-739 (#470)

* Task PM-742: Add autodllplugin, lazy load pages (#472)

* Add autodllplugin, lazy load pages PM-741

* Remove global styles for a PM-741

* BUG PM-741: Outcome on the dashboard is shown on two lines (#471)

* Get rid of bootstrap in trade/share info PM-741

* My trades/shares style fixes PM-741

* Update package-lock.json

* Hotfix: configuration

* Development (#473)

* Hotfix: footer text

* Change AWS security credentials

* Import scoreboard's style PM-738 (#469)

* Fix token amount selector PM-739 (#470)

* Task PM-742: Add autodllplugin, lazy load pages (#472)

* Add autodllplugin, lazy load pages PM-741

* Remove global styles for a PM-741

* BUG PM-741: Outcome on the dashboard is shown on two lines (#471)

* Get rid of bootstrap in trade/share info PM-741

* My trades/shares style fixes PM-741

* Update package-lock.json

* Hotfix: configuration

* Update staging.json

* Update production.json

* Task PM-742: Lazy load the container (#474)

* Add autodllplugin, lazy load pages PM-741

* Remove global styles for a PM-741

* Lazy load the entire container and not the component PM-742

* Resolve conflicts pM-742

* Update staging.json

* Hotfix: olympia staging build

* Hotfix: env_build.sh

* Remove olympia staging for tags

* Hotfix PM-757: Fix missing space in Unlock Wallet modal

* BUG PM-720:  Add a GA opt-in banner (#476)

* Cookie Banner WIP, Fixing problem with global styles PM-720

* Fix global label styles PM-720

* Add container PM-720

* Pass values as a prop PM-720

* Animation fixes

* Add utils PM-720

* Use react-transition-group PM-720

* Add onChange handler for checkboxes PM-720

* Remove unused styles PM-720

* Remove unused CSS rule PM-720

* finish the cookie banner PM-720

* Finish the cookie banner PM-720

* Fix vars.scss PM-720

* Use cookies.js library PM-720

* Bug PM-756: In some txns an error message appears when buying tokens (#477)

* Fix tx explanation modal, add transition for modals PM-756

* Remove expressions used for testing PM-756

* Fix CSS styles for tx modal PM-756

* Update dependencies, enable reward claiming PM-745 (#478)

* Downgrade web3 to make it connect in Firefox PM-758 (#479)

* Update reward values PM-748 (#481)

* Hotfix: add prod env for vendor

* Hotfix: add prod env for vendor

* Revert "Update game guide for dappcon PM-723 (#453)"

This reverts commit 64335d4.

* Hotfix: Game guide phrase about tournament length

* Fix minimum investment value PM-759 (#482)

* Story PM-746: Add Chat Support cookie reminder (#480)

* Cookie Banner WIP, Fixing problem with global styles PM-720

* Fix global label styles PM-720

* Add container PM-720

* Pass values as a prop PM-720

* Animation fixes

* Add utils PM-720

* Use react-transition-group PM-720

* Add onChange handler for checkboxes PM-720

* Remove unused styles PM-720

* Remove unused CSS rule PM-720

* finish the cookie banner PM-720

* Finish the cookie banner PM-720

* Fix vars.scss PM-720

* Use cookies.js library PM-720

* Update dependencies PM-746

* Add support icon PM-746

* Intercom reminder WIP PM-746

* Add EnableIntercom container PM-746

* Development to master (#483)

* Hotfix PM-757: Fix missing space in Unlock Wallet modal

* BUG PM-720:  Add a GA opt-in banner (#476)

* Cookie Banner WIP, Fixing problem with global styles PM-720

* Fix global label styles PM-720

* Add container PM-720

* Pass values as a prop PM-720

* Animation fixes

* Add utils PM-720

* Use react-transition-group PM-720

* Add onChange handler for checkboxes PM-720

* Remove unused styles PM-720

* Remove unused CSS rule PM-720

* finish the cookie banner PM-720

* Finish the cookie banner PM-720

* Fix vars.scss PM-720

* Use cookies.js library PM-720

* Bug PM-756: In some txns an error message appears when buying tokens (#477)

* Fix tx explanation modal, add transition for modals PM-756

* Remove expressions used for testing PM-756

* Fix CSS styles for tx modal PM-756

* Update dependencies, enable reward claiming PM-745 (#478)

* Downgrade web3 to make it connect in Firefox PM-758 (#479)

* Update reward values PM-748 (#481)

* Hotfix: add prod env for vendor

* Hotfix: add prod env for vendor

* Revert "Update game guide for dappcon PM-723 (#453)"

This reverts commit 64335d4.

* Hotfix: Game guide phrase about tournament length

* Fix minimum investment value PM-759 (#482)

* Story PM-746: Add Chat Support cookie reminder (#480)

* Cookie Banner WIP, Fixing problem with global styles PM-720

* Fix global label styles PM-720

* Add container PM-720

* Pass values as a prop PM-720

* Animation fixes

* Add utils PM-720

* Use react-transition-group PM-720

* Add onChange handler for checkboxes PM-720

* Remove unused styles PM-720

* Remove unused CSS rule PM-720

* finish the cookie banner PM-720

* Finish the cookie banner PM-720

* Fix vars.scss PM-720

* Use cookies.js library PM-720

* Update dependencies PM-746

* Add support icon PM-746

* Intercom reminder WIP PM-746

* Add EnableIntercom container PM-746

* Update legal documents PM-747 (#484)

* Update staging configuration, fix modal margins

* Hotfix configuration

* Hotfix configuration

* Hotfix configuration

* Development (#485)

* Update staging configuration, fix modal margins

* Hotfix configuration

* Hotfix configuration

* Hotfix configuration

* Hotfix whitelist

* Hotfix whitelist conflict

* OutcomeSectionScalar hotfixes

* Bring back backmerge fixes

* Hotfix: MarketList reducer

* Hotfix: trades reducer

* Hotfix: sell form

* Hotfix: MarketList reducer

* Hotfix: scalar graph, sell shares form

* BUG PM-767: DecimalValue proptype, LegalCompliance fixes, Invalid winning outcome fix  (#486)

* A lot of bugfixes PM-767

* Regex fix pM-767

* Hotfix: replace indexOf with includes

* BUG PM-766: Redeem winnings didn't work (#487)

* Change whitelist PM-766

* Fix reward claiming PM-766

* Development (#488)

* BUG PM-767: DecimalValue proptype, LegalCompliance fixes, Invalid winning outcome fix  (#486)

* A lot of bugfixes PM-767

* Regex fix pM-767

* Hotfix: replace indexOf with includes

* BUG PM-766: Redeem winnings didn't work (#487)

* Change whitelist PM-766

* Fix reward claiming PM-766

* BUG PM-766: Redeemed shares dont update after redeeming winnings (#489)

* Change whitelist PM-766

* Fix reward claiming PM-766

* Fix sharesForMarketSelector PM-766

* Use getMarketShares selector instead of sharesForMarketSelector PM-766

* Remove console.log PM-766

* Remove unused selector PM-766

* Fix the condition for showing winnings PM-766

* Hotfix: reward claiming

* Hotfix: reward claiming (#491)

* fix the claimhash bug (#493)

* Remove unused import HOTFIX

* Hotfix: Add missing space in Claim Reward modal (#495)

* Development (#496)

* Hotfix: Add missing space in Claim Reward modal

* Hotfix: remove unused reducer/selectors

* Development (#498)

* Hotfix: Add missing space in Claim Reward modal

* Hotfix: remove unused reducer/selectors

* Fix icon, prepare the configuration (#497)

* Hotfix: myTrades selector for the dashboard (#499)

* Hotfix: Add missing space in Claim Reward modal

* Hotfix: remove unused reducer/selectors

* Fix icon, prepare the configuration (#497)

* Enable deployments of git releases

* Add condition to only trigger build on specific cases

* Delete unnecessary travis keys

* Add manual production deployments

* Hotfix: myTrades selector for the dashboard

* Development (#500)

* Hotfix: Add missing space in Claim Reward modal

* Hotfix: remove unused reducer/selectors

* Fix icon, prepare the configuration (#497)

* Enable deployments of git releases

* Add condition to only trigger build on specific cases

* Delete unnecessary travis keys

* Add manual production deployments

* Hotfix: myTrades selector for the dashboard

* Hotfix: normalize collateral token and market addresses in selectors

* Development (#501)

* Hotfix: Add missing space in Claim Reward modal

* Hotfix: remove unused reducer/selectors

* Fix icon, prepare the configuration (#497)

* Enable deployments of git releases

* Add condition to only trigger build on specific cases

* Delete unnecessary travis keys

* Add manual production deployments

* Hotfix: myTrades selector for the dashboard

* Hotfix: normalize collateral token and market addresses in selectors

* Hotfixes for mainnet updated: FormCheckbox, remove unused import

* Development (#502)

* Hotfix: Add missing space in Claim Reward modal

* Hotfix: remove unused reducer/selectors

* Fix icon, prepare the configuration (#497)

* Enable deployments of git releases

* Add condition to only trigger build on specific cases

* Delete unnecessary travis keys

* Add manual production deployments

* Hotfix: myTrades selector for the dashboard

* Hotfix: normalize collateral token and market addresses in selectors

* Hotfixes for mainnet updated: FormCheckbox, remove unused import

* Hotfixes: PropTypes warnings, Scalar market winnings calculations, MarketGraph X-Axis date format
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mmv08 @luarx