Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
87df74c
text changes
xhiroz Oct 23, 2025
1a3ec2d
text changes
xhiroz Oct 28, 2025
64a81ca
Update TradeBox.tsx
xhiroz Oct 29, 2025
607503f
text changes
xhiroz Oct 31, 2025
2b4ad50
Merge remote-tracking branch 'origin/release-87' into text-changes
xhiroz Oct 31, 2025
89f7c90
translations
xhiroz Oct 31, 2025
560cce5
Update PositionItem.tsx
xhiroz Oct 31, 2025
34a665a
Merge branch 'master' into text-changes
xhiroz Oct 31, 2025
af291b4
text changes
xhiroz Oct 31, 2025
c79f9e1
text changes
xhiroz Oct 31, 2025
0009131
translations
xhiroz Oct 31, 2025
d7063da
translations
xhiroz Nov 1, 2025
4ef87e2
text changes
xhiroz Nov 17, 2025
11ffe39
slippage and long stop market fix
xhiroz Dec 3, 2025
f9904da
chore(audit): add audit scripts to CI
divhead Dec 17, 2025
8893ad0
chore: add messages to pre-commit hook
divhead Dec 17, 2025
a1d57c7
chore: ensure src/locales is added in pre-commit hook after linting
divhead Dec 17, 2025
218fed5
chore: update CI workflows and dependencies, add new Yarn configuration
divhead Dec 17, 2025
a558a33
chore: update dependencies in package.json and yarn.lock, rename CI w…
divhead Dec 17, 2025
36f010b
rebuild
divhead Dec 17, 2025
286633c
chore: move bufferutil and utf-8-validate to optionalDependencies in …
divhead Dec 17, 2025
88cafb4
chore: update bufferutil and utf-8-validate versions in package.json …
divhead Dec 17, 2025
641f59a
merge conflicts
divhead Dec 17, 2025
3c6e005
chore: remove optional deps
divhead Dec 17, 2025
41f18fe
chore: update ci script
divhead Dec 17, 2025
1bb1a9d
chore: update pre-commit hook to exit on first failed script
divhead Dec 17, 2025
57223ef
Merge branch 'release' of github.com:gmx-io/gmx-interface into fedev-…
divhead Dec 18, 2025
6810636
Merge remote-tracking branch 'origin/release' into text-changes
xhiroz Dec 19, 2025
25b61fe
FEDEV-2158: Allow same-token swaps
timgmxio Dec 22, 2025
1e8598d
update tests
timgmxio Dec 22, 2025
7cc1558
merge conflicts
divhead Dec 24, 2025
fe31884
Merge pull request #2121 from gmx-io/master
divhead Dec 24, 2025
ec68842
Merge pull request #2101 from gmx-io/fedev-3229-audit-scripts
divhead Dec 24, 2025
eb276ae
remove ssr from config
divhead Dec 24, 2025
d5a51a1
Merge pull request #2122 from gmx-io/fedev-3229-audit-scripts
divhead Dec 24, 2025
743f1b9
merge conflicts
divhead Dec 24, 2025
688a6ba
change batch count
divhead Dec 24, 2025
68e895d
fix CI
divhead Dec 24, 2025
0177b11
Merge pull request #2125 from gmx-io/sync-release
divhead Dec 24, 2025
af3ba78
roll out RPC Fallbacks Ab
divhead Dec 24, 2025
5376192
FEDEV-3232: Add Version Check to CTA Buttons
timgmxio Dec 24, 2025
1650ba1
Merge branch 'release' into fedev-3232
timgmxio Dec 24, 2025
cad59af
fix comments from the review
timgmxio Dec 24, 2025
98ebd12
allow UI version override
timgmxio Dec 24, 2025
83717eb
make allowSameTokenSwap required
timgmxio Dec 24, 2025
fa595c9
Remove Binance Web3 Wallet integration and related dependencies from …
midas-myth Dec 24, 2025
1327cb5
improve tests
timgmxio Dec 24, 2025
5d4614a
fix oi skew flag from squid
divhead Dec 26, 2025
e14c6e5
update squid types
divhead Dec 26, 2025
15c820a
FEDEV-3208: Redesign NetworkDropdown
timgmxio Dec 26, 2025
1af4aa3
FEDEV-3206: Change logic on insufficient gas Button
timgmxio Dec 26, 2025
b3f20cd
Revert "allow UI version override"
timgmxio Dec 29, 2025
07d15f2
Enhance deposit button visibility logic by incorporating non-EOA acco…
midas-myth Dec 29, 2025
46407e2
Merge pull request #2126 from gmx-io/fedev-3232
timgmxio Dec 29, 2025
6018ca0
Merge pull request #2134 from gmx-io/remove-custom-binance
midas-myth Dec 31, 2025
db60aa9
Merge pull request #2133 from gmx-io/deposit-btn-eoa
midas-myth Jan 2, 2026
50430c0
Merge pull request #2117 from gmx-io/fedev-2158
midas-myth Jan 2, 2026
9509199
Merge pull request #2127 from gmx-io/roll-out-rpc-fallbacks
midas-myth Jan 2, 2026
384938a
Enhance multichain token balance display with loading state and add s…
midas-myth Jan 2, 2026
1a7699f
Merge branch 'release' into fedev-3206
timgmxio Jan 5, 2026
bc5d5ff
include payNativeTokenAmount in useSourceChainNativeFeeError calculat…
timgmxio Jan 5, 2026
f223b1d
prevent duplicate translation entries
timgmxio Jan 5, 2026
68a52dd
Merge branch 'release' into fedev-3208
timgmxio Jan 5, 2026
336d407
Merge pull request #2139 from gmx-io/master
divhead Jan 6, 2026
a82469b
review improvements
timgmxio Jan 6, 2026
fb63f35
replace renderContent with content prop
timgmxio Jan 6, 2026
ff3561c
use selected settlement chain
timgmxio Jan 6, 2026
0d2d408
rely on selectedSettlementChain instead of isSettlementChain check
timgmxio Jan 6, 2026
3cf7610
review improvements
timgmxio Jan 6, 2026
66aada0
Remove coingeckoUrl and coingeckoSymbol from tokens configs
qwinndev Jan 6, 2026
9ac8b82
adjust payNativeTokenAmount decimals
timgmxio Jan 6, 2026
03bf431
Merge pull request #2140 from gmx-io/FEDEV-3276-remove-redundant
qwinndev Jan 6, 2026
399fb76
FEDEV-3231: Automatically close multichain Deposit / Withdraw window …
timgmxio Jan 6, 2026
5a7d183
Add balanceType to token data in PositionEditor component
midas-myth Jan 6, 2026
84fce27
check if settlment chain token is native on source chain
timgmxio Jan 7, 2026
c5daab7
Refactor token balance calculations to streamline USD conversion and …
midas-myth Jan 7, 2026
e4a2803
Merge pull request #2129 from gmx-io/fedev-3251-fix-oi-flag
divhead Jan 7, 2026
facea3d
use getMultichainTokenId to get source chain long/short token
timgmxio Jan 7, 2026
d8ae75a
replace getMiltichainTokenId with getMappedTokenId
timgmxio Jan 7, 2026
a9c3e63
Update subsquid API URLs to use production endpoints
midas-myth Jan 7, 2026
b6a8642
Merge pull request #2145 from gmx-io/fix-squid-urls
midas-myth Jan 7, 2026
e9a9d3f
Merge branch 'release' into fedev-3206
timgmxio Jan 7, 2026
60799e7
Merge branch 'release' of github.com:gmx-io/gmx-interface into pool-b…
midas-myth Jan 7, 2026
956f5fe
Remove Binance Chain delay and fix shimmer color to white
midas-myth Jan 7, 2026
bc8159b
Merge branch 'release' into text-changes
xhiroz Jan 7, 2026
5c79bfa
translations update
xhiroz Jan 7, 2026
7ddab3f
Merge pull request #2137 from gmx-io/pool-balances-shimmer
midas-myth Jan 7, 2026
316b656
Update WithdrawalView.tsx
xhiroz Jan 7, 2026
8f33bf8
Merge branch 'release' into fedev-3208
timgmxio Jan 7, 2026
2a703f0
translations
xhiroz Jan 7, 2026
7a36195
Merge pull request #2146 from gmx-io/text-changes
xhiroz Jan 7, 2026
96c45b5
Merge pull request #2143 from gmx-io/fedev-3231
timgmxio Jan 8, 2026
aef80bf
Merge pull request #2131 from gmx-io/fedev-3208
timgmxio Jan 8, 2026
0564730
Merge branch 'release' into fedev-3206
timgmxio Jan 8, 2026
fc1f30f
Merge pull request #2144 from gmx-io/fix-position-editor
midas-myth Jan 8, 2026
0127626
Merge pull request #2132 from gmx-io/fedev-3206
timgmxio Jan 8, 2026
e48af64
Merge branch 'master' into release-93
divhead Jan 8, 2026
d0b1036
Fix typo in EarnDiscoveryPage component
divhead Jan 8, 2026
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
41 changes: 41 additions & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Audit

on:
pull_request:
branches:
- master
- release
- "release-*"
types: [opened, edited, synchronize, reopened]
workflow_dispatch:

jobs:
audit:
name: Audit
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "22"
cache: "yarn"

- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Run security audit
run: yarn npm audit --severity moderate --no-deprecations

- name: Install SDK dependencies
run: |
cd sdk
yarn install --frozen-lockfile

- name: Run SDK security audit
run: |
cd sdk
yarn npm audit --severity moderate --no-deprecations
32 changes: 0 additions & 32 deletions .github/workflows/packages-scan.yml

This file was deleted.

30 changes: 14 additions & 16 deletions .github/workflows/pr-tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Tests and linting
name: Run Tests

on:
pull_request:
Expand All @@ -10,20 +10,8 @@ on:
workflow_dispatch:

jobs:
check-conflicts:
name: Check Merge Conflicts
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Check for merge conflicts
run: |
chmod +x ./scripts/check-conflicts.sh
./scripts/check-conflicts.sh

ci:
name: CI Checks
name: Linting, Type Checking, and Tests
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -44,14 +32,24 @@ jobs:
yarn build

- name: Run linting
run: yarn lint
run: yarn lint:ci

- name: Run type checking
run: yarn tscheck
run: yarn tscheck:ci

- name: Run tests
run: yarn test:ci

- name: Run SDK linting
run: |
cd sdk
yarn lint:ci

- name: Run SDK type checking
run: |
cd sdk
yarn tscheck:ci

- name: Run SDK tests
run: |
cd sdk
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
.env.test.local
.env.production.local

# cache files
.eslintcache
*.tsbuildinfo

npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
2 changes: 2 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/sh
set -e
. "$(dirname "$0")/_/husky.sh"

yarn lingui:generate
yarn lint-staged
yarn tscheck
git add src/locales/
942 changes: 942 additions & 0 deletions .yarn/releases/yarn-4.12.0.cjs

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
defaultSemverRangePrefix: ""
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
spec: "@yarnpkg/plugin-version"
enableImmutableInstalls: false

yarnPath: .yarn/releases/yarn-3.1.0.cjs
yarnPath: .yarn/releases/yarn-4.12.0.cjs
28 changes: 15 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,28 @@
"build-sdk": "cd ./sdk && yarn build",
"test": "vitest",
"test:ci": "vitest run",
"lint": "node node_modules/.bin/eslint src",
"lint": "node node_modules/.bin/eslint src --fix --cache --cache-location .eslintcache",
"lint:ci": "node node_modules/.bin/eslint src --max-warnings=0",
"lint:fix": "node node_modules/.bin/eslint src --fix",
"check:ci": "yarn lint && yarn test:ci && yarn tscheck",
"check:ci": "yarn lint:ci && yarn test:ci && yarn tscheck:ci",
"pre-commit": "yarn run lint",
"pre-push": "vitest run",
"prepare": "husky install && yarn lingui:prepare",
"extract": "NODE_ENV=development lingui extract --clean",
"compile": "lingui compile",
"lingui:prepare": "NODE_ENV=development yarn extract && yarn compile",
"lingui:generate": "NODE_ENV=development lingui extract --overwrite",
"ts:clean": "tsc --build --clean && tsc --build",
"tscheck": "yarn ts:clean && tsc -p tsconfig.json --noEmit",
"tscheck": "tsc -p tsconfig.json --noEmit --incremental",
"tscheck:ci": "tsc -p tsconfig.json --noEmit",
"clean:cache": "rm -rf .eslintcache tsconfig.tsbuildinfo build/**/*.tsbuildinfo",
"clean:lint": "rm -rf .eslintcache",
"clean:ts": "rm -rf tsconfig.tsbuildinfo build/**/*.tsbuildinfo",
"prettier": "prettier --write src/**/*.{js,ts,jsx,tsx,css,scss}",
"postinstall": "cd ./sdk && echo \"Building SDK\" && yarn && yarn build",
"prebuild": "cd ./sdk && yarn tsx scripts/prebuild"
},
"dependencies": {
"@apollo/client": "3.5.6",
"@binance/w3w-utils": "1.1.4",
"@davatar/react": "1.8.1",
"@floating-ui/dom": "1.6.7",
"@floating-ui/react": "0.26.19",
Expand Down Expand Up @@ -135,20 +138,19 @@
]
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@babel/plugin-transform-private-property-in-object": "^7.25.9",
"@lingui/cli": "4.10.0",
"@lingui/loader": "4.10.0",
"@lingui/vite-plugin": "4.11.3",
"@types/react-calendar": "4.1.0",
"@types/react-date-range": "1.4.9",
"@typescript-eslint/eslint-plugin": "8.26.1",
"@typescript-eslint/parser": "8.26.1",
"@vitejs/plugin-react": "4.3.1",
"@vitest/web-worker": "2.0.5",
"@vitest/web-worker": "^2.1.9",
"autoprefixer": "10.4.20",
"babel-plugin-macros": "3.1.0",
"buffer": "6.0.3",
"eslint": "^8.41.0",
"eslint": "^8.57.1",
"eslint-config-react-app": "^7.0.1",
"eslint-import-resolver-typescript": "4.2.2",
"eslint-plugin-es-x": "8.1.0",
Expand All @@ -157,7 +159,7 @@
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-react-perf": "3.3.2",
"happy-dom": "14.12.3",
"happy-dom": "^20.0.0",
"husky": "7.0.4",
"lint-staged": "12.3.4",
"postcss": "8.4.41",
Expand All @@ -167,11 +169,11 @@
"tailwindcss": "3.4.4",
"terser": "5.43.1",
"tsx": "4.19.0",
"vite": "5.4.0",
"vite": "^5.4.18",
"vite-bundle-analyzer": "0.20.1",
"vite-plugin-svgr": "4.2.0",
"vite-tsconfig-paths": "5.0.1",
"vitest": "2.0.5"
"vitest": "^2.1.9"
},
"lint-staged": {
"sdk/**/*.{js,ts,jsx,tsx}": [
Expand All @@ -186,5 +188,5 @@
"prettier --write"
]
},
"packageManager": "yarn@3.1.0"
"packageManager": "yarn@4.12.0"
}
Loading