Skip to content

chore: update lingui #5

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

Merged
merged 6 commits into from
Aug 14, 2025
Merged

chore: update lingui #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67c00c4
chore: update lingui dependencies
gabitoesmiapodo Aug 14, 2025
c53ec40
chore: add eslint-plugin-lingui
gabitoesmiapodo Aug 14, 2025
bb971d9
fix: fixed problem with updated lingui dependencies
gabitoesmiapodo Aug 14, 2025
7ab51ce
Merge branch 'feat/internationalization-setup-for-swap-cow-fi' into f…
gabitoesmiapodo Aug 14, 2025
f3b4de5
refactor: avoid lingui usage at the top level
gabitoesmiapodo Aug 14, 2025
a231bbd
Merge remote-tracking branch 'BN_fork/feat/update-lingui' into feat/u…
gabitoesmiapodo Aug 14, 2025
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
10 changes: 6 additions & 4 deletions apps/cowswap-frontend/src/common/containers/ConfirmationModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useAtomValue } from 'jotai'

import { confirmationModalContextAtom } from 'common/hooks/useConfirmationRequest'
import { t } from '@lingui/core/macro'

import { confirmationModalContextAtom, DEFAULT_CONFIRMATION_MODAL_CONTEXT } from 'common/hooks/useConfirmationRequest'
import { ConfirmationModal as Pure, ConfirmationModalProps } from 'common/pure/ConfirmationModal'

// TODO: Add proper return type annotation
Expand All @@ -13,12 +15,12 @@ export function ConfirmationModal({ isOpen, onDismiss }: Pick<ConfirmationModalP
<Pure
isOpen={isOpen}
onDismiss={onDismiss}
title={title}
callToAction={callToAction}
title={title === DEFAULT_CONFIRMATION_MODAL_CONTEXT.title ? t`Confirm Action` : title}
callToAction={callToAction === DEFAULT_CONFIRMATION_MODAL_CONTEXT.callToAction ? t`Confirm` : callToAction}
description={description}
onEnable={onEnable}
warning={warning}
confirmWord={confirmWord}
confirmWord={confirmWord === DEFAULT_CONFIRMATION_MODAL_CONTEXT.confirmWord ? t`confirm` : confirmWord}
action={action}
skipInput={skipInput}
/>
Expand Down
11 changes: 5 additions & 6 deletions apps/cowswap-frontend/src/common/hooks/useConfirmationRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ import { useCallback } from 'react'

import { Command } from '@cowprotocol/types'

import { t } from '@lingui/macro'

import { useCloseModal, useOpenModal } from 'legacy/state/application/hooks'
import { ApplicationModal } from 'legacy/state/application/reducer'

import { ConfirmationModalProps } from '../pure/ConfirmationModal/ConfirmationModal'
import { ConfirmationModalProps } from '../pure/ConfirmationModal'

type TriggerConfirmationParams = Pick<
ConfirmationModalProps,
Expand All @@ -35,18 +33,19 @@ interface ConfirmationModalContext {
}: TriggerConfirmationParams) => Promise<void>
}

const DEFAULT_CONFIRMATION_MODAL_CONTEXT: ConfirmationModalContext = {
export const DEFAULT_CONFIRMATION_MODAL_CONTEXT: ConfirmationModalContext = {
onDismiss: () => {},
onEnable: () => {},
title: 'Confirm Action',
callToAction: 'Confirm',
confirmWord: t`confirm`,
confirmWord: 'confirm',
Copy link

Copilot AI Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hardcoded string 'confirm' should be internationalized. This breaks the i18n pattern and makes the default confirmation word untranslatable.

Suggested change
confirmWord: 'confirm',
confirmWord: msg`confirm`,

Copilot uses AI. Check for mistakes.
action: 'confirm',
skipInput: false,
triggerConfirmation: async () => {},
}

export const confirmationModalContextAtom = atomWithReset<ConfirmationModalContext>(DEFAULT_CONFIRMATION_MODAL_CONTEXT)

export const updateConfirmationModalContextAtom = atom(
null,
(get, set, nextState: Partial<ConfirmationModalContext>) => {
Expand Down Expand Up @@ -98,6 +97,6 @@ export function useConfirmationRequest({
openModal()
})
},
[setContext, openModal, closeModal, onDismissParam, resetContext, onEnableParam]
[closeModal, onDismissParam, onEnableParam, openModal, resetContext, setContext]
)
}
4 changes: 4 additions & 0 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const { FlatCompat } = require('@eslint/eslintrc')
const js = require('@eslint/js')
const nxEslintPlugin = require('@nx/eslint-plugin')
const eslintImport = require('eslint-plugin-import')
const pluginLingui = require('eslint-plugin-lingui')
const react = require('eslint-plugin-react')
const reactHooks = require('eslint-plugin-react-hooks')
const unusedImports = require('eslint-plugin-unused-imports')
Expand All @@ -12,6 +13,9 @@ const compat = new FlatCompat({
})

module.exports = [
// Add lingui recommended configuration
pluginLingui.configs['flat/recommended'],

{
ignores: ['static-files/'],
},
Expand Down
13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
"@fortawesome/free-solid-svg-icons": "^6.7.1",
"@fortawesome/react-fontawesome": "^0.2.2",
"@gnosis.pm/dex-js": "^0.10.0",
"@lingui/cli": "^4.10.0",
"@lingui/core": "^4.10.0",
"@lingui/macro": "^4.10.0",
"@lingui/react": "^4.10.0",
"@lingui/cli": "^5.4.1",
"@lingui/core": "^5.4.1",
"@lingui/macro": "^5.4.1",
"@lingui/react": "^5.4.1",
"@material-ui/core": "^4.11.0",
"@metamask/eth-sig-util": "^5.0.2",
"@metamask/jazzicon": "^2.0.0",
Expand Down Expand Up @@ -246,8 +246,8 @@
"@commitlint/cli": "^19.8.1",
"@commitlint/config-conventional": "^19.8.1",
"@eslint/eslintrc": "^3.1.0",
"@lingui/swc-plugin": "^5.5.2",
"@lingui/vite-plugin": "^5.3.1",
"@lingui/swc-plugin": "^5.6.0",
"@lingui/vite-plugin": "^5.4.1",
"@nx/cypress": "21.0.3",
"@nx/eslint": "21.0.3",
"@nx/eslint-plugin": "21.0.3",
Expand Down Expand Up @@ -306,6 +306,7 @@
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jest": "^28.3.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-lingui": "^0.10.1",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "5.2.0",
"eslint-plugin-unused-imports": "^4.1.3",
Expand Down
Loading
Loading