Skip to content
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.

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

More convenient way to check if api is ready #230

Merged
merged 4 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"jsxSingleQuote": true,
"trailingComma": "es5",
"bracketSpacing": true,
"arrowParens": "always"
}
"arrowParens": "always",
"printWidth": 100
}
6 changes: 2 additions & 4 deletions cypress/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ export const connectWallet = () => {
address: ALICE,
name: 'Alice',
type: 'sr25519',
mnemonic:
'bottom drive obey lake curtain smoke basket hold race lonely fit walk',
mnemonic: 'bottom drive obey lake curtain smoke basket hold race lonely fit walk',
},
{
address: BOB,
name: 'Bob',
type: 'sr25519',
mnemonic:
'sample split bamboo west visual approve brain fox arch impact relief smile',
mnemonic: 'sample split bamboo west visual approve brain fox arch impact relief smile',
},
],
APP_NAME
Expand Down
8 changes: 2 additions & 6 deletions cypress/e2e/purchase.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@ describe('E2E tests for the purchase page', () => {

connectWallet();
// Wallet connection works:
cy.get('[data-cy="connect-wallet"]', { timeout: 5 * 1000 }).should(
'not.exist'
);
cy.get('[data-cy="connect-wallet"]', { timeout: 5 * 1000 }).should('not.exist');
cy.get('[data-cy="address"]').should('exist');
cy.get('[data-cy="address"]').should('contain.text', '5DfhGy...1EqRzV');

// Fetching complete
cy.get('[data-cy="loading-current-price"]', { timeout: 60 * 1000 }).should(
'not.exist'
);
cy.get('[data-cy="loading-current-price"]', { timeout: 60 * 1000 }).should('not.exist');
});

it('Successfully loads the purchase page and all UI elements are in place.', () => {
Expand Down
6 changes: 2 additions & 4 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ const nextConfig = {

ROCOCO_CORETIME_INDEXER: process.env.ROCOCO_CORETIME_INDEXER || '',
KUSAMA_CORETIME_INDEXER: process.env.KUSAMA_CORETIME_INDEXER || '',
SUBSCAN_CORETIME_WESTEND_INDEXER:
process.env.SUBSCAN_CORETIME_WESTEND_INDEXER || '',
SUBSCAN_CORETIME_WESTEND_INDEXER: process.env.SUBSCAN_CORETIME_WESTEND_INDEXER || '',

ROCOCO_CORETIME_DICT: process.env.ROCOCO_CORETIME_DICT || '',
KUSAMA_CORETIME_DICT: process.env.KUSAMA_CORETIME_DICT || '',
SUBSCAN_CORETIME_WESTEND_DICT:
process.env.SUBSCAN_CORETIME_WESTEND_DICT || '',
SUBSCAN_CORETIME_WESTEND_DICT: process.env.SUBSCAN_CORETIME_WESTEND_DICT || '',

WS_REGIONX_COCOS_CHAIN: process.env.WS_REGIONX_COCOS_CHAIN || '',

Expand Down
4 changes: 1 addition & 3 deletions src/apis/orders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ export const fetchUserContribution = async (
return fetchGraphql(API_COCOS_INDEXER, query);
};

export const fetchOrders = async (
after: string | null
): Promise<ApiResponse> => {
export const fetchOrders = async (after: string | null): Promise<ApiResponse> => {
const query = `{
orders(after: ${after}) {
nodes {
Expand Down
4 changes: 1 addition & 3 deletions src/apis/sales.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import { fetchGraphql } from '@/utils/fetchGraphql';
import { API_CORETIME_INDEXER } from '@/consts';
import { ApiResponse, NetworkType } from '@/models';

export const fetchBurnInfo = async (
network: NetworkType
): Promise<ApiResponse> => {
export const fetchBurnInfo = async (network: NetworkType): Promise<ApiResponse> => {
const query = `{
stats {
nodes {
Expand Down
6 changes: 2 additions & 4 deletions src/chaindata/kusama.ts
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,7 @@ const prodParasKusama: ChainDetails[] = [
},
text: 'K-Laos',
ui: {
color:
'linear-gradient(158deg, rgba(226,157,0,1) 0%, rgba(234,55,203,1) 100%)',
color: 'linear-gradient(158deg, rgba(226,157,0,1) 0%, rgba(234,55,203,1) 100%)',
logo: chainsLaosPNG,
},
},
Expand Down Expand Up @@ -922,8 +921,7 @@ const prodParasKusama: ChainDetails[] = [
info: 'xode',
paraId: 3344,
providers: {
XodeCommunity:
'wss://rpcnodea01.xode.net/n7yoxCmcIrCF6VziCcDmYTwL8R03a/rpc',
XodeCommunity: 'wss://rpcnodea01.xode.net/n7yoxCmcIrCF6VziCcDmYTwL8R03a/rpc',
},
text: 'Xode',
ui: {
Expand Down
6 changes: 2 additions & 4 deletions src/chaindata/rococo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,7 @@ const testParasRococo: ChainDetails[] = [
},
text: 'Stagex',
ui: {
color:
'linear-gradient(158deg, rgba(226,157,0,1) 0%, rgba(234,55,203,1) 100%)',
color: 'linear-gradient(158deg, rgba(226,157,0,1) 0%, rgba(234,55,203,1) 100%)',
logo: chainsTotemSVG,
},
},
Expand Down Expand Up @@ -673,8 +672,7 @@ const testParasRococo: ChainDetails[] = [
},
text: 'Tinkernet',
ui: {
color:
'linear-gradient(90deg, rgba(253,52,166,1) 0%, rgba(22,213,239,1) 100%)',
color: 'linear-gradient(90deg, rgba(253,52,166,1) 0%, rgba(22,213,239,1) 100%)',
logo: chainsTinkerPNG,
},
},
Expand Down
11 changes: 2 additions & 9 deletions src/components/Accounts/TxHistory/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ interface TxHistoryModalProps extends DialogProps {
account: Address;
}

export const TxHistoryModal = ({
open,
onClose,
account,
}: TxHistoryModalProps) => {
export const TxHistoryModal = ({ open, onClose, account }: TxHistoryModalProps) => {
const theme = useTheme();

const { network } = useNetwork();
Expand All @@ -40,10 +36,7 @@ export const TxHistoryModal = ({
<Dialog open={open} onClose={onClose} maxWidth='md'>
<DialogContent className={styles.container}>
<Box>
<Typography
variant='subtitle1'
sx={{ color: theme.palette.common.black }}
>
<Typography variant='subtitle1' sx={{ color: theme.palette.common.black }}>
Transaction History
</Typography>
</Box>
Expand Down
8 changes: 1 addition & 7 deletions src/components/Elements/Address/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@ interface AddressProps {
center?: boolean;
}

export const Address = ({
value,
isShort,
isCopy,
size = 32,
center,
}: AddressProps) => {
export const Address = ({ value, isShort, isCopy, size = 32, center }: AddressProps) => {
const { toastInfo } = useToast();

const onCopy = () => {
Expand Down
4 changes: 1 addition & 3 deletions src/components/Elements/Balance/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ export const Balance = ({
<Box className={styles.container}>
{items.map(({ label, value, symbol, decimals }, index) => (
<Box key={index} className={styles.balanceItem}>
<Typography sx={{ color: theme.palette.text.primary }}>
{label}
</Typography>
<Typography sx={{ color: theme.palette.text.primary }}>{label}</Typography>
<Box
sx={{
bgcolor: theme.palette.common.white,
Expand Down
7 changes: 1 addition & 6 deletions src/components/Elements/Banner/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ export const Banner = ({ content, severity, link }: BannerProps) => {
<Alert
severity={severity}
action={
<IconButton
aria-label='close'
color='inherit'
size='small'
onClick={handleClose}
>
<IconButton aria-label='close' color='inherit' size='small' onClick={handleClose}>
<CloseIcon fontSize='inherit' />
</IconButton>
}
Expand Down
17 changes: 2 additions & 15 deletions src/components/Elements/Cards/FeatureCard/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
import {
Button,
Card,
CardActions,
CardContent,
Typography,
useTheme,
} from '@mui/material';
import { Button, Card, CardActions, CardContent, Typography, useTheme } from '@mui/material';
import Image, { StaticImageData } from 'next/image';
import { useRouter } from 'next/router';
import React from 'react';
Expand All @@ -20,13 +13,7 @@ interface FeatureCardProps {
href: string;
}

export const FeatureCard = ({
title,
buttonText,
image,
enabled,
href,
}: FeatureCardProps) => {
export const FeatureCard = ({ title, buttonText, image, enabled, href }: FeatureCardProps) => {
const { push, query } = useRouter();
const theme = useTheme();

Expand Down
22 changes: 4 additions & 18 deletions src/components/Elements/Cards/SalePhaseCard/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import {
Box,
CircularProgress,
Tooltip,
Typography,
useTheme,
} from '@mui/material';
import { Box, CircularProgress, Tooltip, Typography, useTheme } from '@mui/material';

import { SalePhase } from '@/models';

Expand All @@ -14,28 +8,20 @@ interface SalePhaseProps {
value: SalePhase;
cyLabel?: string;
}
export const SalePhaseCard = ({
label,
loading,
value,
cyLabel,
}: SalePhaseProps) => {
export const SalePhaseCard = ({ label, loading, value, cyLabel }: SalePhaseProps) => {
const theme = useTheme();

const tooltip = {
[SalePhase.Interlude]:
'During the interlude phase, renewals take place. Regular purchases cannot be made.',
[SalePhase.Leadin]:
'During the leadin phase, the price decreases from the start price to the floor price.',
[SalePhase.Regular]:
'During the fixed price phase, cores are sold for the floor price.',
[SalePhase.Regular]: 'During the fixed price phase, cores are sold for the floor price.',
};

return (
<Box>
<Typography sx={{ color: theme.palette.text.primary }}>
{label}
</Typography>
<Typography sx={{ color: theme.palette.text.primary }}>{label}</Typography>
<Tooltip title={tooltip[value]} arrow sx={{ fontSize: '1rem' }}>
{loading ? (
<CircularProgress size={16} />
Expand Down
10 changes: 3 additions & 7 deletions src/components/Elements/CountDown/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ export const CountDown = ({ remainingTime }: CountDownProps) => {
const [daysDuration, setDaysDuration] = useState(0);

const getTimeSeconds = (time: number) => (minuteSeconds - time) | 0;
const getTimeMinutes = (time: number) =>
((time % hourSeconds) / minuteSeconds) | 0;
const getTimeHours = (time: number) =>
((time % daySeconds) / hourSeconds) | 0;
const getTimeMinutes = (time: number) => ((time % hourSeconds) / minuteSeconds) | 0;
const getTimeHours = (time: number) => ((time % daySeconds) / hourSeconds) | 0;
const getTimeDays = (time: number) => (time / daySeconds) | 0;
const renderTime = (dimension: string, time: number) => {
return (
Expand Down Expand Up @@ -119,9 +117,7 @@ export const CountDown = ({ remainingTime }: CountDownProps) => {
})}
>
{({ elapsedTime, color }) => (
<span style={{ color }}>
{renderTime('seconds', getTimeSeconds(elapsedTime))}
</span>
<span style={{ color }}>{renderTime('seconds', getTimeSeconds(elapsedTime))}</span>
)}
</CountdownCircleTimer>
</Stack>
Expand Down
4 changes: 1 addition & 3 deletions src/components/Elements/InfoItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ export const InfoItem = ({ label, value }: ItemDetail) => {
const theme = useTheme();
return (
<Stack direction='column' gap='0.5rem'>
<Typography sx={{ color: theme.palette.text.primary }}>
{label}
</Typography>
<Typography sx={{ color: theme.palette.text.primary }}>{label}</Typography>
<Typography
sx={{
color: theme.palette.common.black,
Expand Down
15 changes: 2 additions & 13 deletions src/components/Elements/Inputs/AddressInput/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
import {
Box,
Button,
IconButton,
Input,
InputAdornment,
Typography,
} from '@mui/material';
import { Box, Button, IconButton, Input, InputAdornment, Typography } from '@mui/material';
import Identicon from '@polkadot/react-identicon';

import { isValidAddress, writeToClipboard } from '@/utils/functions';
Expand All @@ -19,11 +12,7 @@ export interface AddressInputProps {
label: string;
}

export const AddressInput = ({
onChange,
address,
label,
}: AddressInputProps) => {
export const AddressInput = ({ onChange, address, label }: AddressInputProps) => {
const {
state: { activeAccount },
} = useAccounts();
Expand Down
11 changes: 2 additions & 9 deletions src/components/Elements/Inputs/AmountInput/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ interface AmountInputProps {

// TODO: Fetch dot price and show how much is the currency amount worth.

export const AmountInput = ({
currency,
title,
caption,
setAmount,
}: AmountInputProps) => {
export const AmountInput = ({ currency, title, caption, setAmount }: AmountInputProps) => {
return (
<>
<Stack alignItems='baseline' direction='row' gap={1} mb='0.5rem'>
Expand All @@ -28,9 +23,7 @@ export const AmountInput = ({
<TextField
placeholder={`Enter ${currency} amount`}
InputProps={{
endAdornment: (
<InputAdornment position='end'>{currency}</InputAdornment>
),
endAdornment: <InputAdornment position='end'>{currency}</InputAdornment>,
style: {
borderRadius: '1rem',
textAlign: 'center',
Expand Down
4 changes: 1 addition & 3 deletions src/components/Elements/Inputs/FileInput/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@ function InputFile({
<CloseIcon />
</IconButton>
<div className={styles.fileName}>{file.name}</div>
<div
className={styles.fileSize}
>{`(${file.size.toLocaleString()} bytes)`}</div>
<div className={styles.fileSize}>{`(${file.size.toLocaleString()} bytes)`}</div>
</div>
)}
</div>
Expand Down
5 changes: 1 addition & 4 deletions src/components/Elements/Label/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ export const Label = ({ text, color, width }: LabelProps) => {
sx={{
borderRadius: '5px',
padding: '0.5rem 1rem',
background:
color === 'success'
? theme.palette.success.main
: theme.palette.primary.main,
background: color === 'success' ? theme.palette.success.main : theme.palette.primary.main,
color: theme.palette.common.white,
fontWeight: 400,
width,
Expand Down
6 changes: 1 addition & 5 deletions src/components/Elements/Selectors/AssetSelector/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ interface AssetSelectorProps {
symbol: string;
}

export default function AssetSelector({
asset,
setAsset,
symbol,
}: AssetSelectorProps) {
export default function AssetSelector({ asset, setAsset, symbol }: AssetSelectorProps) {
const items = [
{
value: AssetType.TOKEN,
Expand Down
Loading
Loading