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

Merge develop into testnet #1363

Merged
merged 5 commits into from
Oct 27, 2023
Merged

Merge develop into testnet #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d82655
Refactor: some fetcher-related code (#121)
WhiteMinds Oct 25, 2023
2c7fd6a
Refactor: Remove the index.d.ts file and move its types to the approp…
WhiteMinds Oct 25, 2023
5c17eab
chore: update joyid info (#130)
zhangyouxin Oct 27, 2023
67d4be3
Merge branch 'nervosnetwork:develop' into develop
Keith-CY Oct 27, 2023
8d73898
Merge pull request #1362 from Magickbase/develop
Keith-CY Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ module.exports = {
allow: ['^.*_'],
},
],
'@typescript-eslint/array-type': 'error',
},
env: {
jest: true,
Expand Down
4 changes: 2 additions & 2 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useMemo } from 'react'
import { QueryClient, QueryClientProvider } from 'react-query'
import { ThemeProvider } from 'styled-components'
import { DefaultTheme, ThemeProvider } from 'styled-components'
import Routers from './routes'
import Toast from './components/Toast'
import useInitApp from './contexts/providers/hook'
Expand All @@ -18,7 +18,7 @@ const queryClient = new QueryClient()

const App = () => {
useInitApp()
const theme = useMemo(
const theme = useMemo<DefaultTheme>(
() => ({
primary: getPrimaryColor(),
secondary: getSecondaryColor(),
Expand Down
149 changes: 0 additions & 149 deletions src/__mocks__/block.ts
View file
Open in desktop

This file was deleted.

Loading