Skip to content

Commit 2f209dc

Browse files
committed
Merge main into prod: AI Aggregator toggle + Sass @import to @use migration
Changes: - Added AI_AGGREGATOR preference toggle (default: ON) - Migrated 170+ SCSS files from deprecated @import to @use syntax - Added i18next package dependency - Updated package versions Conflict resolution: - SCSS files: kept @use syntax from main - dapp.connect.tsx: kept cleaner version from main (removed redundant initialState) - package.json: kept main version with newer packages and i18next
2 parents eb1a5fb + 854ac76 commit 2f209dc

File tree

183 files changed

+419
-343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+419
-343
lines changed

package-lock.json

Lines changed: 219 additions & 139 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
"lint": "lint-staged"
2929
},
3030
"dependencies": {
31-
"@capacitor-firebase/messaging": "^7.2.0",
31+
"@capacitor-firebase/messaging": "^7.3.1",
3232
"@capacitor/action-sheet": "^7.0.2",
33-
"@capacitor/android": "^7.4.2",
33+
"@capacitor/android": "^7.4.3",
3434
"@capacitor/app": "^7.0.1",
3535
"@capacitor/browser": "^7.0.2",
3636
"@capacitor/camera": "^7.0.2",
@@ -42,7 +42,7 @@
4242
"@capacitor/push-notifications": "^7.0.1",
4343
"@capacitor/toast": "^7.0.2",
4444
"@capgo/capacitor-social-login": "^7.11.4",
45-
"@datadog/browser-rum": "^6.19.0",
45+
"@datadog/browser-rum": "^6.22.0",
4646
"@emoji-mart/react": "^1.1.1",
4747
"@emotion/react": "^11.14.0",
4848
"@emotion/styled": "^11.14.1",
@@ -64,6 +64,7 @@
6464
"dotenv": "^17.2.3",
6565
"ethers": "^6.15.0",
6666
"firebase": "^11.10.0",
67+
"i18next": "^25.7.1",
6768
"i18next-browser-languagedetector": "^8.2.0",
6869
"iso-country-currency": "^0.7.2",
6970
"js-base64": "^3.7.8",
@@ -80,7 +81,7 @@
8081
"react-error-boundary": "^6.0.0",
8182
"react-google-recaptcha": "^3.1.0",
8283
"react-helmet": "^6.1.0",
83-
"react-hook-form": "^7.58.0",
84+
"react-hook-form": "^7.65.0",
8485
"react-i18next": "^15.7.3",
8586
"react-infinite-scroller": "^1.2.6",
8687
"react-intersection-observer": "^9.16.0",
@@ -118,7 +119,7 @@
118119
"@storybook/test": "^8.6.12",
119120
"@swc/core": "^1.13.3",
120121
"@swc/jest": "^0.2.38",
121-
"@testing-library/dom": "^10.4.0",
122+
"@testing-library/dom": "^10.4.1",
122123
"@testing-library/jest-dom": "^6.6.4",
123124
"@testing-library/react": "^16.3.0",
124125
"@testing-library/user-event": "^14.6.1",
@@ -133,17 +134,18 @@
133134
"@types/react-infinite-scroller": "^1.2.5",
134135
"@typescript-eslint/eslint-plugin": "^8.31.1",
135136
"@typescript-eslint/parser": "^8.45.0",
136-
"@vitejs/plugin-react-swc": "^3.11.0",
137+
"@vitejs/plugin-react-swc": "^4.1.0",
137138
"autoprefixer": "^10.4.21",
138139
"babel-loader": "^10.0.0",
140+
"caniuse-lite": "^1.0.30001759",
139141
"cypress": "^14.5.4",
140142
"cypress-file-upload": "^5.0.8",
141143
"eslint": "^9.34.0",
142144
"eslint-config-prettier": "^10.1.8",
143145
"eslint-plugin-cypress": "^5.1.1",
144146
"eslint-plugin-i18next": "^6.1.3",
145147
"eslint-plugin-import": "^2.31.0",
146-
"eslint-plugin-jsdoc": "^51.0.1",
148+
"eslint-plugin-jsdoc": "^50.6.3",
147149
"eslint-plugin-jsx-a11y": "^6.10.2",
148150
"eslint-plugin-prettier": "^5.5.4",
149151
"eslint-plugin-react": "^7.37.5",
@@ -157,7 +159,7 @@
157159
"lint-staged": "^16.2.3",
158160
"postcss": "^8.5.6",
159161
"prettier": "^3.6.2",
160-
"sass": "^1.87.0",
162+
"sass": "^1.93.2",
161163
"storybook": "^8.6.14",
162164
"tailwindcss": "^3.4.17",
163165
"ts-jest": "^29.4.1",

src/constants/PREFERENCES.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,14 @@ export const PREFERENCES_TOGGLES = [
544544
subtitle: 'Do you offer payment in crypto?',
545545
value: 'OFF',
546546
},
547+
548+
// AI Aggregator preference toggle to ON
549+
{
550+
key: 'AI_AGGREGATOR',
551+
title: 'AI Aggregator',
552+
subtitle: 'Enable AI Aggregator features.',
553+
value: 'ON',
554+
},
547555
];
548556

549557
export const PREFERENCES_CULTURE_QUESTIONS = [

src/dapp/dapp.connect.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,6 @@ const WALLET_TYPES = {
5252
} as const;
5353

5454
export const useWeb3 = () => {
55-
const initialState = {
56-
wallet: null,
57-
walletProvider: null,
58-
provider: null,
59-
signer: null,
60-
account: '',
61-
chainId: null,
62-
connected: false,
63-
network: null,
64-
networkName: '',
65-
testnet: config.dappENV === 'testnet',
66-
balance: null,
67-
};
6855
const dispatch = useDispatch();
6956
const walletState = useSelector((state: RootState) => state.wallet);
7057
const [pendingConnector, setPendingConnector] = useState<Connector<CreateConnectorFn> | null>(walletState.wallet);
@@ -164,7 +151,6 @@ export const useWeb3 = () => {
164151
dispatch(resetWalletState());
165152
localStorage.removeItem('walletType');
166153
localStorage.removeItem('selectedWallet');
167-
setWalletState(initialState);
168154
};
169155

170156
useEffect(() => {

src/index.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// @import url('https://fonts.googleapis.com/css2?family=Hahmlet&family=Work+Sans');
22
// @import url(https://fonts.googleapis.com/css?family=Hahmlet:700|Work+Sans:bold);
3-
@import './styles/constants/primitives';
4-
@import './styles/base/reset';
5-
@import './styles/icons.scss';
6-
@import './styles/tailwind.scss';
3+
@use './styles/constants/primitives' as *;
4+
@use './styles/base/reset' as *;
5+
@use './styles/icons.scss' as *;
6+
@use './styles/tailwind.scss' as *;
77

88
@layer base {
99
@font-face {

src/modules/Auth/components/IntroHeader/header.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'src/styles/constants/_primitives.scss';
1+
@use 'src/styles/constants/primitives' as *;
22

33
.container {
44
display: flex;

src/modules/Auth/components/LinkedInButton/index.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'src/styles/constants/_primitives.scss';
1+
@use 'src/styles/constants/primitives' as *;
22

33
.btn {
44
width: 100%;

src/modules/Auth/components/Step/index.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'src/styles/constants/_primitives.scss';
1+
@use 'src/styles/constants/primitives' as *;
22

33
.container {
44
width: 100%;

src/modules/Auth/containers/ServiceIntro/service-intro.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'src/styles/constants/_primitives.scss';
1+
@use 'src/styles/constants/primitives' as *;
22

33
.review {
44
max-width: 656px;

src/modules/Auth/containers/forgetPassword/OtpForm/otpForm.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'src/styles/constants/_primitives.scss';
1+
@use 'src/styles/constants/primitives' as *;
22

33
.resend {
44
color: $color-primary-700;

0 commit comments

Comments
 (0)