Skip to content

Commit de84a7e

Browse files
authored
Merge pull request #626 from subquery/feat/ksqt-to-sqt
feat: ksqt to sqt
2 parents 60f33c9 + 0e42199 commit de84a7e

File tree

12 files changed

+359
-512
lines changed

12 files changed

+359
-512
lines changed

Diff for: .env.staging

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VITE_IPFS_GATEWAY=https://unauthipfs.subquery.network/ipfs/api/v0
2-
VITE_QUERY_REGISTRY_PROJECT=https://api.subquery.network/sq/subquery/kepler-network-staging
2+
VITE_QUERY_REGISTRY_PROJECT=https://api.subquery.network/sq/subquery/kepler-testnet__c3Vic
33
VITE_SUBSCRIPTION_REGISTRY_PROJECT=wss://api.subquery.network/sq/subquery/kepler-network
44
VITE_QUERY_SWAP_EXCHANGE_PROJECT=https://api.subquery.network/sq/subquery/kepler-network-exchange
55
VITE_TOP_100_INDEXERS=https://leaderboard-api.subquery.network/graphql
@@ -10,7 +10,7 @@ VITE_STABLE_TOKEN=USDC.e
1010
VITE_STABLE_TOKEN_ADDRESS=0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174
1111
VITE_FLEXPLAN_ENABLED=true
1212
VITE_STUDIO_ENABLED=false
13-
VITE_NETWORK=kepler
13+
VITE_NETWORK=testnet
1414
VITE_GQL_PROXY=https://gql-proxy.subquery.network
1515
VITE_AUTH_URL=https://kepler-auth.subquery.network
1616
VITE_NETWORK_DEPLOYMENT_ID=QmWfLyhgwyhwAfbnHQfg4YhJG9Vuj4cuDH5R4oW35t6MYn

Diff for: .env.testnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VITE_IPFS_GATEWAY=https://unauthipfs.subquery.network/ipfs/api/v0
2-
VITE_QUERY_REGISTRY_PROJECT=https://api.subquery.network/sq/subquery/kepler-testnet
2+
VITE_QUERY_REGISTRY_PROJECT=https://api.subquery.network/sq/subquery/kepler-testnet__c3Vic
33
VITE_SUBSCRIPTION_REGISTRY_PROJECT=wss://api.subquery.network/sq/subquery/kepler-testnet
44
VITE_QUERY_SWAP_EXCHANGE_PROJECT=https://api.subquery.network/sq/subquery/kepler-testnet-exchange
55
VITE_TOP_100_INDEXERS=https://leaderboard-api.thechaindata.com/graphql

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"@rainbow-me/rainbowkit": "^1.2.0",
2121
"@sentry/react": "^7.57.0",
2222
"@subql/apollo-links": "^1.2.5",
23-
"@subql/components": "1.0.3-21",
24-
"@subql/contract-sdk": "0.16.2",
23+
"@subql/components": "1.0.3-27",
24+
"@subql/contract-sdk": "0.17.1-1",
2525
"@subql/network-clients": "^0.3.17",
2626
"@subql/network-config": "0.3.17-2",
2727
"@subql/network-query": "0.3.16-19",

Diff for: src/components/IndexerDetails/Progress.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import * as React from 'react';
55
import { useTranslation } from 'react-i18next';
6-
import { ProgressBar, Typography } from '@subql/components';
6+
import { SubqlProgress, Typography } from '@subql/components';
77
import { indexingProgress } from '@subql/network-clients';
88
import { strip } from '@utils';
99

@@ -33,7 +33,7 @@ const Progress: React.FC<{ startBlock?: number; currentBlock: number; targetBloc
3333

3434
return (
3535
<div className={styles.progress}>
36-
<ProgressBar progress={maxProgress} className={styles.progressBar} showInfo={false} />
36+
<SubqlProgress percent={maxProgress * 100} className={styles.progressBar} showInfo={false} />
3737
{blocksBehind > 0 && (
3838
<div>
3939
<Typography variant="medium" className={styles.precentage}>

Diff for: src/components/IndexerProgress/IndexerProgress.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
import * as React from 'react';
5-
import { ProgressBar } from '@subql/components';
5+
import { SubqlProgress } from '@subql/components';
66

77
import styles from './IndexerProgress.module.css';
88

@@ -40,7 +40,7 @@ const IndexerProgress: React.FC<Props> = ({ indexerStatus, chainBlockHeight, sta
4040
return (
4141
<div className={[styles.container, containerClassName].join(' ')}>
4242
<span className={styles.status}>{status}</span>
43-
<ProgressBar progress={maxProgress} />
43+
<SubqlProgress percent={maxProgress * 100} />
4444
</div>
4545
);
4646
};

Diff for: src/pages/account/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { AccountHeader } from './AccountHeaders/Header';
2323
import styles from './Account.module.less';
2424

2525
//TODO: add fragments so can better type this
26-
function reduceTotal(rewards: any) {
26+
export function reduceTotal(rewards: any) {
2727
return formatEther(
2828
rewards?.reduce(
2929
(accumulator: any, currentValue: { amount: unknown }) =>
@@ -34,7 +34,7 @@ function reduceTotal(rewards: any) {
3434
);
3535
}
3636

37-
const FormatCardLine: React.FC<{ title: string; amount: number | string; linkName: string; link: string }> = ({
37+
export const FormatCardLine: React.FC<{ title: string; amount: number | string; linkName: string; link: string }> = ({
3838
title,
3939
amount,
4040
linkName,

Diff for: src/pages/indexer/MyPlans/List/List.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ const List: React.FC<Props> = ({ data, onRefresh, title }) => {
109109
return 'inactive';
110110
};
111111
return (
112-
<Tag state={text().includes('inactive') ? 'error' : 'success'} style={{ textTransform: 'uppercase' }}>
112+
<Tag color={text().includes('inactive') ? 'error' : 'success'} style={{ textTransform: 'uppercase' }}>
113113
{text()}
114114
</Tag>
115115
);

Diff for: src/pages/indexer/MyProjects/OwnDeployments/OwnDeployments.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import * as React from 'react';
55
import { useTranslation } from 'react-i18next';
66
import { useNavigate } from 'react-router-dom';
7-
import { ProgressBar, Spinner } from '@subql/components';
7+
import { Spinner, SubqlProgress } from '@subql/components';
88
import { TableTitle } from '@subql/components';
99
import { getDeploymentStatus } from '@utils/getIndexerStatus';
1010
import { Table, TableProps, Typography } from 'antd';
@@ -51,7 +51,9 @@ export const OwnDeployments: React.FC<Props> = ({ indexer, emptyList, desc }) =>
5151
<Typography.Text type="secondary">{indexingProgressErr}</Typography.Text>
5252
</div>
5353
);
54-
return <ProgressBar progress={truncateToDecimalPlace(indexingProgress, 2)} className={styles.progress} />;
54+
return (
55+
<SubqlProgress percent={truncateToDecimalPlace(indexingProgress, 2) * 100} className={styles.progress} />
56+
);
5557
},
5658
},
5759
{

Diff for: src/pages/swapksqt/index.module.less

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
.swapksqt {
2+
max-width: 1280px;
3+
margin: 0 auto;
4+
display: flex;
5+
flex-direction: column;
6+
align-items: center;
7+
padding: 40px;
8+
9+
.swapCard {
10+
display: flex;
11+
flex-direction: column;
12+
align-items: center;
13+
padding: 24px;
14+
max-width: 408px;
15+
width: 408px;
16+
border: 1px solid rgba(223, 227, 232, 0.60);
17+
text-align: center;
18+
19+
.smallCard {
20+
border-radius: 8px;
21+
border: 1px solid var(--sq-gray300);
22+
width: 100%;
23+
24+
.top {
25+
background: var(--sq-gray200);
26+
padding: 16px;
27+
display: flex;
28+
align-items: center;
29+
justify-content: center;
30+
}
31+
.bottom {
32+
padding: 16px;
33+
display: flex;
34+
align-items: center;
35+
justify-content: center;
36+
}
37+
}
38+
}
39+
}

0 commit comments

Comments
 (0)