Skip to content

Commit

Permalink
Merge branch 'main' into nabla/feat-export_csv
Browse files Browse the repository at this point in the history
  • Loading branch information
DavideSegullo authored Jun 14, 2024
2 parents cc88d6c + 26a70e9 commit fdd8df7
Show file tree
Hide file tree
Showing 373 changed files with 11,031 additions and 7,023 deletions.
9 changes: 0 additions & 9 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,3 @@ vite-env.d.ts
polyfills.ts
vite.config.ts
commitlint.config.ts

# Temporarily ignore, we will slowly remove each directory as we fix files to follow ESLint rules
/src/views/forms

# components dir is being worked on
/src/components/*

# unignored components
!/src/components/Table.tsx
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
"rules": {
"class-methods-use-this": "off",
"import/extensions": "off",
// let prettier handle
"import/order": "off",
"import/no-extraneous-dependencies": [
"error",
{
Expand All @@ -43,6 +45,7 @@
"no-underscore-dangle": "off",
"no-use-before-define": "off",
"prefer-destructuring": "off",
"prefer-object-spread": "off",
"prettier/prettier": "error",
"react/display-name": "off",
"react/forbid-prop-types": "off",
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Lint PR Title
name: Lint
on:
pull_request:
types: ['opened', 'edited', 'reopened', 'synchronize']
Expand Down Expand Up @@ -28,3 +28,7 @@ jobs:
echo "${PR_TITLE}" | pnpx commitlint --config commitlint.config.ts
env:
PR_TITLE: '${{ github.event.pull_request.title }}'

- name: ESLint
run: |
pnpm lint
2 changes: 2 additions & 0 deletions .github/workflows/validate-other-market-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ jobs:
- name: Start v4 localnet
run: |
cd v4-chain/protocol
sed -i '/\.consensus\.timeout_commit.*-v '\''5s'\''/s/5s/1s/' testing/testnet-local/local.sh
sed -i '/ datadog-agent:/,/ ports:/d; /^ - "8125:8215"/d; /^ - "8126:8126"/d' docker-compose.yml
echo "Building v4-chain/protocol..."
make build
echo "Starting localnet..."
Expand Down
5 changes: 2 additions & 3 deletions .ladle/components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import '@/polyfills';
import { useEffect, useState } from 'react';

import '@/index.css';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { GrazProvider } from 'graz';
import { QueryClient, QueryClientProvider } from 'react-query';
import { Provider } from 'react-redux';
import styled from 'styled-components';
import { WagmiConfig } from 'wagmi';
Expand All @@ -23,8 +23,6 @@ import { SubaccountProvider } from '@/hooks/useSubaccount';
import { GlobalStyle } from '@/styles/globalStyle';

import { SelectItem, SelectMenu } from '@/components/SelectMenu';

import { store } from '@/state/_store';
import {
AppColorMode,
AppTheme,
Expand All @@ -37,6 +35,7 @@ import { setLocaleLoaded, setSelectedLocale } from '@/state/localization';
import { config } from '@/lib/wagmi';

import './ladle.css';
import { store } from "@/state/_store";

const queryClient = new QueryClient();

Expand Down
52 changes: 28 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"ladle-p": "ladle preview",
"lint": "eslint --ext .ts,.tsx src/",
"fix-lint": "eslint --fix --ext .ts,.tsx src/",
"tag": "node scripts/generate-tag.js",
"test": "vitest run",
"tsc": "tsc",
"postinstall": "tar -xzC public -f tradingview/tradingview.tgz",
Expand All @@ -46,12 +47,12 @@
"@cosmjs/proto-signing": "^0.32.1",
"@cosmjs/stargate": "^0.32.1",
"@cosmjs/tendermint-rpc": "^0.32.1",
"@dydxprotocol/v4-abacus": "1.7.18",
"@dydxprotocol/v4-client-js": "^1.1.10",
"@dydxprotocol/v4-localization": "^1.1.86",
"@dydxprotocol/v4-abacus": "^1.7.72",
"@dydxprotocol/v4-client-js": "^1.1.15",
"@dydxprotocol/v4-localization": "^1.1.121",
"@ethersproject/providers": "^5.7.2",
"@js-joda/core": "^5.5.3",
"@privy-io/react-auth": "^1.59.7",
"@privy-io/react-auth": "^1.66.2",
"@privy-io/wagmi-connector": "^0.1.12",
"@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-checkbox": "^1.0.4",
Expand Down Expand Up @@ -79,9 +80,10 @@
"@react-types/grid": "^3.1.8",
"@react-types/shared": "^3.18.1",
"@react-types/table": "^3.6.1",
"@reduxjs/toolkit": "^1.9.5",
"@reduxjs/toolkit": "^2.2.5",
"@scure/bip32": "^1.3.0",
"@scure/bip39": "^1.2.0",
"@tanstack/react-query": "^5.37.1",
"@types/lodash": "^4.14.195",
"@types/styled-components": "^5.1.26",
"@visx/axis": "^3.1.0",
Expand Down Expand Up @@ -117,11 +119,10 @@
"react-aria": "^3.25.0",
"react-dom": "^18.2.0",
"react-number-format": "^5.2.2",
"react-query": "^3.39.3",
"react-redux": "^8.1.1",
"react-redux": "^9.1.2",
"react-router-dom": "^6.14.0",
"react-stately": "^3.23.0",
"reselect": "^4.1.8",
"reselect": "^5.1.0",
"styled-components": "^5.3.11",
"use-latest": "^1.2.1",
"viem": "^1.20.0",
Expand All @@ -140,10 +141,10 @@
"@types/luxon": "^3.3.0",
"@types/mocha": "^10.0.6",
"@types/node": "^20.3.1",
"@types/react": "^18.2.14",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.2.6",
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react": "^4.0.1",
"@wdio/browserstack-service": "^8.32.4",
"@wdio/cli": "^8.32.4",
Expand All @@ -158,25 +159,28 @@
"babel-loader": "^9.1.2",
"babel-plugin-styled-components": "^2.1.4",
"browserify-zlib": "^0.2.0",
"eslint": "^8.43.0",
"chalk": "^5.3.0",
"eslint": "^8.57.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.8.0",
"eslint-config-standard-with-typescript": "^35.0.0",
"eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard-with-typescript": "^43.0.1",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.2.0",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-react-hooks": "^4.6.2",
"husky": "^9.0.11",
"minimist": "^1.2.8",
"node-fetch": "^3.3.1",
"pnpm": "^8.6.6",
"prettier": "^2.8.8",
"prettier": "^3.2.5",
"readline-sync": "^1.4.10",
"rollup-plugin-sourcemaps": "^0.6.3",
"stream-browserify": "^3.0.0",
"ts-node": "^10.9.2",
"tsx": "^4.7.1",
"typescript": "^5.1.3",
Expand Down
Loading

0 comments on commit fdd8df7

Please sign in to comment.