Merge branch 'played-created-filters' of https://github.com/1Hive/quests

 into played-created-filters

.gitignore

@@ -37,10 +37,4 @@ yarn-error.log*
 
 .vercel
 
-.yarn/
-!.yarn/cache
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
+.yarn

package.json

@@ -11,33 +11,32 @@
   "private": true,
   "scripts": {
     "ci": "yarn install --pure-lockfile --immutable --skip-builds",
-    "lint": "yarn workspace @quests/react-app lint",
-    "chain": "yarn workspace @quests/hardhat chain",
-    "test": "yarn workspace @quests/hardhat test",
-    "start": "yarn workspace @quests/react-app start",
-    "build": "yarn workspace @quests/react-app build --max-old-space-size=12288",
-    "start:local": "yarn workspace @quests/react-app start:local",
-    "compile": "yarn workspace @quests/hardhat compile",
-    "coverage": "yarn workspace @quests/hardhat test-coverage",
-    "deploy:rinkeby": "yarn workspace @quests/hardhat deploy:rinkeby",
-    "deploy:local": "yarn workspace @quests/hardhat deploy:local",
+    "lint": "yarn workspace @1hive/quests-react-app lint",
+    "chain": "yarn workspace @1hive/quests-hardhat chain",
+    "test": "yarn workspace @1hive/quests-hardhat test",
+    "start": "yarn workspace @1hive/quests-react-app start",
+    "build": "yarn workspace @1hive/quests-react-app build --max-old-space-size=12288",
+    "start:local": "yarn workspace @1hive/quests-react-app start:local",
+    "compile": "yarn workspace @1hive/quests-hardhat compile",
+    "coverage": "yarn workspace @1hive/quests-hardhat test-coverage",
+    "deploy:rinkeby": "yarn workspace @1hive/quests-hardhat deploy:rinkeby",
+    "deploy:local": "yarn workspace @1hive/quests-hardhat deploy:local",
     "graph-run-node": "cd docker/graph-node && docker-compose up",
     "graph-remove-node": "cd docker/graph-node && docker-compose down",
-    "e2e": "yarn workspace @quests/e2e test"
+    "e2e": "yarn workspace @1hive/e2e test"
   },
   "workspaces": {
     "packages": [
       "packages/*"
     ],
-    "installConfig.hoistingLimits": [
+    "nohoist": [
       "**/@graphprotocol/graph-ts",
       "**/@graphprotocol/graph-ts/**"
     ]
   },
   "devDependencies": {
-    "@types/node": "^14.14.22",
     "npm-run-all": "^4.1.5",
     "ts-node": "^10.2.1",
     "typescript": "^4.4.2"
   }
-}
+}

packages/e2e/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "@quests/e2e",
+  "name": "@1hive/e2e",
   "version": "1.0.0",
   "description": "e2e",
   "main": "dist/bundle.js",
   "scripts": {
-    "webapp:start": "yarn workspace @quests/react-app start",
+    "webapp:start": "yarn workspace @1hive/quests-react-app start",
     "test": "jest --runInBand --json --outputFile=output/jest-reporter.json --testLocationInResults",
     "test:headless": "xvfb-run --auto-servernum yarn test",
     "ci": "yarn install --pure-lockfile --immutable --skip-builds"
@@ -20,14 +20,12 @@
     "expect-puppeteer": "^6.1.1",
     "fs-extra": "^10.1.0",
     "jest-environment-node": "^29.1.2",
-    "puppeteer": "^17.1.3",
-    "webpack": "4.44.2"
+    "puppeteer": "^17.1.3"
   },
   "devDependencies": {
     "@types/expect-puppeteer": "^5.0.1",
     "@types/jest": "^29.1.1",
     "@types/jest-environment-puppeteer": "^5.0.2",
-    "@types/node": "^20.2.5",
     "@types/puppeteer": "^5.4.6",
     "dotenv": "^16.0.2",
     "fs-extra": "^10.1.0",
@@ -41,6 +39,7 @@
     "ts-loader": "^8.0.3",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.3",
+    "webpack": "^5.76.0",
     "webpack-cli": "^3.3.12"
   }
 }

packages/hardhat/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@quests/hardhat",
+  "name": "@1hive/quests-hardhat",
   "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",

packages/react-app/package.json

@@ -1,6 +1,6 @@
 {
   "proxy": "https://cors-anywhere.herokuapp.com/",
-  "name": "@quests/react-app",
+  "name": "@1hive/quests-react-app",
   "version": "0.1.1-alpha",
   "license": "MIT",
   "homepage": ".",
@@ -60,12 +60,13 @@
     "moment-timezone": "^0.5.35",
     "node-sass": "^7.0.0",
     "prop-types": "^15.7.2",
-    "react": "17.0.2",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "react-app-rewire-hot-loader": "^2.0.1",
     "react-app-rewired": "^2.1.8",
     "react-dev-utils": "^11.0.4",
     "react-device-detect": "^1.17.0",
-    "react-dom": "17.0.2",
+    "react-focus-within": "^2.0.2",
     "react-hot-loader": "^4.13.0",
     "react-icons": "^4.2.0",
     "react-infinite-scroll-component": "^6.0.0",
@@ -74,14 +75,13 @@
     "react-scripts": "^4.0.2",
     "react-spring": "^8.0.27",
     "s3-folder-upload": "^2.3.5",
-    "styled-components": "5.2.1",
+    "styled-components": "^5.2.1",
     "tslib": "^2.3.1",
     "typescript": "^4.9.4",
     "urql": "1.8.2",
     "use-wallet": "npm:@1hive/[email protected]",
     "web3": "^1.3.5",
     "web3-utils": "^1.2.0",
-    "webpack": "4.44.2",
     "yup": "^0.32.11"
   },
   "devDependencies": {
@@ -96,8 +96,8 @@
     "@types/jest": "^27.4.1",
     "@types/lodash-es": "^4.17.5",
     "@types/node": "^16.11.0",
-    "@types/react": "17.0.2",
-    "@types/react-dom": "17.0.2",
+    "@types/react": "^17.0.2",
+    "@types/react-dom": "^17.0.2",
     "@types/react-router-dom": "^5.3.1",
     "@types/styled-components": "^5.1.25",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
@@ -146,6 +146,13 @@
     "watch": "node ./scripts/watch.js",
     "ci": "yarn install --pure-lockfile --network-concurrency 1"
   },
+  "resolutions": {
+    "styled-components": "^5",
+    "@types/react": "17.0.2",
+    "@types/react-dom": "17.0.2",
+    "react": "17.0.2",
+    "react-dom": "17.0.2"
+  },
   "jest": {
     "setupFiles": [
       "./config/jest/setupTest.js"
@@ -157,4 +164,4 @@
     "preset": "ts-jest",
     "testEnvironment": "node"
   }
-}
+}

packages/react-app/src/components/account/account-module.tsx

@@ -5,6 +5,7 @@ import { Button, GU, IconConnect, springs } from '@1hive/1hive-ui';
 import { noop } from 'lodash-es';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { animated, Transition } from 'react-spring/renderprops';
+import { getNetwork } from 'src/networks';
 import styled from 'styled-components';
 import { useWallet } from '../../contexts/wallet.context';
 import { getUseWalletProviders, isConnected } from '../../utils/web3.utils';
@@ -13,7 +14,6 @@ import AccountButton from './account-button';
 import AccountScreenConnected from './screen-connected';
 import AccountModuleConnectingScreen from './screen-connecting';
 import ScreenProviders from './screen-providers';
-import { getNetwork } from '../../networks';
 
 const AccountWrapperStyled = styled.div`
   display: flex;
@@ -186,7 +186,6 @@ function AccountModule({ compact = false }: Props) {
         >
           {/* @ts-ignore */}
           <div ref={popoverFocusElement} tabIndex="0" css="outline: 0" id="account-wrapper">
-            {/* @ts-ignore */}
             <Transition
               native
               immediate={!animate}

packages/react-app/src/components/field-input/field-input.tsx

@@ -1,8 +1,8 @@
 import { useTheme } from '@1hive/1hive-ui';
 import React from 'react';
 import Skeleton from 'react-loading-skeleton';
+import { GUpx } from 'src/utils/style.util';
 import styled, { css } from 'styled-components';
-import { GUpx } from '../../utils/style.util';
 import { HelpTooltip } from './help-tooltip';
 
 const FieldStyled = styled.div<{

packages/react-app/tsconfig.json

@@ -4,11 +4,7 @@
     "outDir": "build/dist",
     "module": "esnext",
     "target": "es6",
-    "lib": [
-      "es6",
-      "dom",
-      "ES2021"
-    ],
+    "lib": ["es6", "dom", "ES2021"],
     "sourceMap": true,
     "allowJs": true,
     "jsx": "react-jsx",
@@ -17,10 +13,10 @@
     "forceConsistentCasingInFileNames": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,
-    "suppressImplicitAnyIndexErrors": true,
     "noImplicitAny": true,
     "importHelpers": true,
     "strictNullChecks": true,
+    "suppressImplicitAnyIndexErrors": true,
     "allowSyntheticDefaultImports": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -41,7 +37,5 @@
     "jest",
     "src/setupTests.ts"
   ],
-  "include": [
-    "src"
-  ]
-}
+  "include": ["src"]
+}

packages/services/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@quests/services",
+  "name": "@1hive/quests-services",
   "version": "1.0.0",
   "license": "MIT",
   "scripts": {
@@ -14,6 +14,6 @@
     "run-graph-node": "cd graph-node && docker-compose up",
     "remove-graph-node": "cd graph-node && docker-compose down",
     "clean-graph-node": "rm -rf graph-node/data/",
-    "restart": "yarn remove-graph-node && yarn clean-graph-node || true && yarn run-graph-node"
+    "restart":"yarn remove-graph-node && yarn clean-graph-node || true && yarn run-graph-node"
   }
 }

packages/subgraphs/quest-subgraph/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@quests/subgraph",
+  "name": "@1hive/quests-subgraph",
   "license": "UNLICENSED",
   "version": "0.1.0",
   "type": "module",
@@ -16,7 +16,7 @@
     "deploy:gnosis": "yarn manifest:gnosis && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ corantin/quests-subgraph-gnosis",
     "deploy:staging-gnosis": "yarn manifest:gnosis && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ corantin/quests-subgraph-staging",
     "deploy:local": "graph deploy --ipfs http://0.0.0.0:5001 --node http://0.0.0.0:8020 corantin/quests-subgraph",
-    "hardhat:deploy:local": "yarn workspace @quests/hardhat deploy:local && yarn workspace @quests/hardhat"
+    "hardhat:deploy:local": "yarn workspace @1hive/quests-hardhat deploy:local && yarn workspace @1hive/quests-hardhat"
   },
   "dependencies": {
     "@graphprotocol/graph-cli": "^0.23.2",
@@ -27,4 +27,4 @@
     "minimist": "^1.2.6",
     "mustache": "^4.2.0"
   }
-}
+}