Skip to content

Commit

Permalink
Merge branch 'main' into nabla/feat-market_page
Browse files Browse the repository at this point in the history
  • Loading branch information
DavideSegullo authored Apr 30, 2024
2 parents 66ebe1c + 8191f8e commit c589121
Show file tree
Hide file tree
Showing 203 changed files with 12,398 additions and 4,254 deletions.
19 changes: 10 additions & 9 deletions .ladle/components.tsx
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
import '@/polyfills';

import { useEffect, useState } from 'react';

import '@/index.css';
import { GrazProvider } from 'graz';
import { QueryClient, QueryClientProvider } from 'react-query';
import { Provider } from 'react-redux';
import styled from 'styled-components';
import { WagmiConfig } from 'wagmi';
import { GrazProvider } from 'graz';
import { QueryClient, QueryClientProvider } from 'react-query';

import { SupportedLocales } from '@/constants/localization';

import { AccountsProvider } from '@/hooks/useAccounts';
import { AppThemeAndColorModeProvider } from '@/hooks/useAppThemeAndColorMode';
import { DydxProvider } from '@/hooks/useDydxClient';
import { DialogAreaProvider } from '@/hooks/useDialogArea';
import { DydxProvider } from '@/hooks/useDydxClient';
import { LocaleProvider } from '@/hooks/useLocaleSeparators';
import { PotentialMarketsProvider } from '@/hooks/usePotentialMarkets';
import { RestrictionProvider } from '@/hooks/useRestrictions';
import { SubaccountProvider } from '@/hooks/useSubaccount';

import { GlobalStyle } from '@/styles/globalStyle';

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

import { store } from '@/state/_store';
import {
AppColorMode,
AppTheme,
AppThemeSystemSetting,
AppColorMode,
setAppThemeSetting,
setAppColorMode,
setAppThemeSetting,
} from '@/state/configs';

import { setLocaleLoaded, setSelectedLocale } from '@/state/localization';
import { store } from '@/state/_store';

import { config } from '@/lib/wagmi';

import '@/index.css';
import './ladle.css';

const queryClient = new QueryClient();
Expand Down
19 changes: 11 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"explorer.sortOrder": "mixed",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"files.watcherExclude": {
"**/.git": true,
"**/node_modules/*": true,
"**/node_modules/@dydxprotocol/v4-abacus": false
}
"explorer.sortOrder": "mixed",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"files.watcherExclude": {
"**/.git": true,
"**/node_modules/*": true,
"**/node_modules/@dydxprotocol/v4-abacus": false
},
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
}
}
2 changes: 1 addition & 1 deletion __tests__/e2e/test.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { expect, browser, $ } from '@wdio/globals';
import { $, browser, expect } from '@wdio/globals';

describe('Smoke test', () => {
it('should authenticate with vercel and load website', async () => {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
"@cosmjs/proto-signing": "^0.32.1",
"@cosmjs/stargate": "^0.32.1",
"@cosmjs/tendermint-rpc": "^0.32.1",
"@dydxprotocol/v4-abacus": "^1.6.44",
"@dydxprotocol/v4-abacus": "^1.6.50",
"@dydxprotocol/v4-client-js": "^1.1.7",
"@dydxprotocol/v4-localization": "^1.1.66",
"@dydxprotocol/v4-localization": "^1.1.76",
"@ethersproject/providers": "^5.7.2",
"@js-joda/core": "^5.5.3",
"@privy-io/react-auth": "^1.59.7",
Expand Down
Loading

0 comments on commit c589121

Please sign in to comment.