Skip to content

Commit 370ab44

Browse files
committed
Merge branch 'main' into feature/add-assets-order
2 parents 198d0ed + 82c4f7e commit 370ab44

File tree

21 files changed

+645
-68
lines changed

21 files changed

+645
-68
lines changed
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# dev
2+
13
VITE_POCO_SUBGRAPH_URL="https://thegraph.iex.ec/subgraphs/name/bellecour/poco-v5"
24
VITE_DATAPROTECTOR_SUBGRAPH_URL="https://thegraph.iex.ec/subgraphs/name/bellecour/dataprotector-v2"
3-
VITE_REOWN_PROJECT_ID=b89f75687c01fa0df9e68c903283012d
5+
VITE_REOWN_PROJECT_ID=
6+
VITE_CLERK_PUBLISHABLE_KEY=
7+
VITE_FAUCET_API_URL = 'https://dev-rlc-faucet.iex.ec'
8+
9+
# prod
10+
11+
VITE_FAUCET_API_URL = 'https://rlc-faucet.iex.ec'

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{".":"1.25.0"}
1+
{".":"1.26.0"}

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# Changelog
22

3+
## [1.26.0](https://github.com/iExecBlockchainComputing/explorer-v2/compare/iexec-explorer-v1.25.0...iexec-explorer-v1.26.0) (2025-10-15)
4+
5+
6+
### 🚀 Features
7+
8+
* add category description to deal and task details ([a2a681e](https://github.com/iExecBlockchainComputing/explorer-v2/commit/a2a681e36818fe79acda3c49d4649737f2d03726))
9+
* add faucet with Clerk authentication ([#84](https://github.com/iExecBlockchainComputing/explorer-v2/issues/84)) ([dfc1581](https://github.com/iExecBlockchainComputing/explorer-v2/commit/dfc1581c35b91f04d6de6edf908db1b110931bd8))
10+
* add tooltip for category details in deal and task components ([8c2aab0](https://github.com/iExecBlockchainComputing/explorer-v2/commit/8c2aab0fb759129efd3e2c0f19344815aa55f009))
11+
* add tooltip for trust level in deal details ([47bab96](https://github.com/iExecBlockchainComputing/explorer-v2/commit/47bab9615930b68e98e73787973646ee0016d498))
12+
* add tooltip support in DetailsTable and add more information tooltip for tag line ([01f6b91](https://github.com/iExecBlockchainComputing/explorer-v2/commit/01f6b9197dfad635fd262b818fb56746fc0133d8))
13+
* remove experimental chain filtering ([#83](https://github.com/iExecBlockchainComputing/explorer-v2/issues/83)) ([2bf7683](https://github.com/iExecBlockchainComputing/explorer-v2/commit/2bf7683290d31ef93b1e563fa31177e0687dbc65))
14+
* reorder trust line in deal details ([330d9c0](https://github.com/iExecBlockchainComputing/explorer-v2/commit/330d9c0e71e26f4c362e968d4473e1f3bef34bcb))
15+
* update category reference to use name instead of catid in deal and task details ([01053bd](https://github.com/iExecBlockchainComputing/explorer-v2/commit/01053bd7d513af4113781941281234382cbe1fd2))
16+
17+
18+
### 🐞 Bug Fixes
19+
20+
* move parentheses usage outside of formatDateCompact function, fixing double parentheses ([0db2766](https://github.com/iExecBlockchainComputing/explorer-v2/commit/0db2766b7d5b5aa0f3c4c1911192a68b34e52087))
21+
* update ModeToggle button styling to use border for selected state ([682eede](https://github.com/iExecBlockchainComputing/explorer-v2/commit/682eede45c8222c9e6fba51e46dea2e88471fe56))
22+
323
## [1.25.0](https://github.com/iExecBlockchainComputing/explorer-v2/compare/iexec-explorer-v1.24.0...iexec-explorer-v1.25.0) (2025-10-08)
424

525

package-lock.json

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

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "iexec-explorer",
33
"private": true,
4-
"version": "1.25.0",
4+
"version": "1.26.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
@@ -18,6 +18,7 @@
1818
"watch:codegen:poco": "graphql-codegen --config codegenPoco.ts --watch"
1919
},
2020
"dependencies": {
21+
"@clerk/clerk-react": "^5.51.0",
2122
"@fontsource-variable/anybody": "^5.2.6",
2223
"@fontsource-variable/mulish": "^5.2.6",
2324
"@fontsource/space-mono": "^5.2.8",
@@ -48,8 +49,8 @@
4849
"iexec": "^8.20.0",
4950
"lucide-react": "^0.536.0",
5051
"prettier-plugin-tailwindcss": "^0.6.14",
51-
"react": "^19.1.1",
52-
"react-dom": "^19.1.1",
52+
"react": "^19.2.0",
53+
"react-dom": "^19.2.0",
5354
"react-hook-form": "^7.62.0",
5455
"rollbar": "^2.26.4",
5556
"tailwind-merge": "^3.3.1",

src/components/ModeToggle.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function ModeToggle() {
3838
title={label}
3939
className={cn(
4040
'text-foreground hover:bg-muted p-1',
41-
selected && 'bg-transparent'
41+
selected && 'border'
4242
)}
4343
onClick={() => {
4444
if (theme !== value) setTheme(value as Theme);

src/components/navbar/NavBar.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ export function Navbar() {
2424
<span className="hidden lg:block">iExec Explorer</span>
2525
</ChainLink>
2626
<div className="mr-8 flex items-center gap-4 md:mr-0">
27+
<Button variant="link" asChild className="text-foreground -mr-4">
28+
<ChainLink to="/faucet">Faucet</ChainLink>
29+
</Button>
2730
{isConnected && (
28-
<div className="hidden md:flex">
31+
<div className="-mr-4 hidden md:flex">
2932
<Button variant="link" asChild className="text-foreground">
3033
<ChainLink to={`/address/${userAddress}?from=my_activity`}>
3134
My activity
@@ -34,9 +37,9 @@ export function Navbar() {
3437
<Button variant="link" asChild className="text-foreground">
3538
<ChainLink to="/account">iExec Account</ChainLink>
3639
</Button>
37-
<span className="border-secondary border-l" />
3840
</div>
3941
)}
42+
<span className="border-secondary h-9 border-l" />
4043
<div className="content hidden gap-4 md:flex">
4144
<ModeToggle />
4245
<ChainSelector />

src/config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export const TABLE_REFETCH_INTERVAL = 10_000;
1212

1313
export const IPFS_GATEWAY_URL = 'https://ipfs.iex.ec';
1414
export const API_COINGECKO_URL = 'https://api.coingecko.com/api/v3/simple/';
15+
export const FAUCET_API_URL = import.meta.env.VITE_FAUCET_API_URL;
1516

1617
export const SUPPORTED_CHAINS = [
1718
{

src/hooks/useLoginLogout.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
import { useAuth } from '@clerk/clerk-react';
12
import { useAppKit } from '@reown/appkit/react';
23
import { useDisconnect } from 'wagmi';
34

45
export function useLoginLogout() {
56
const { open } = useAppKit();
67
const { disconnectAsync } = useDisconnect();
8+
const { signOut, isSignedIn } = useAuth();
79

810
const logout = async () => {
11+
if (isSignedIn) {
12+
signOut();
13+
}
914
try {
1015
await disconnectAsync();
1116
} catch (err) {

0 commit comments

Comments
 (0)