Skip to content

Commit 7692cb9

Browse files
committed
SD-34: Make adjustments based on feedback
1 parent 6254f95 commit 7692cb9

File tree

29 files changed

+166
-152
lines changed

29 files changed

+166
-152
lines changed

src/domains/chains/utils/definitions/chains/alephZero/alephZero.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const config: ChainConfig = {
4747
},
4848
},
4949
testnet: {
50-
name: 'Aleph Zero',
50+
name: 'A0 EVM Testnet',
5151
ChainIcon,
5252
NativeTokenIcon,
5353
id: 2039,
Lines changed: 2 additions & 11 deletions
Loading

src/domains/misc/components/InfoPair.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ import CIcon from 'src/domains/misc/components/CIcon';
77
import { typography } from 'src/domains/styling/utils/tokens';
88
import vars from 'src/domains/styling/utils/vars';
99

10-
type ValueProps = { value: ReactElement | string };
11-
1210
const MIN_SEPARATOR_WIDTH = 10;
1311

1412
type Props = {
1513
label: ReactElement | string,
1614
className?: string,
1715
tooltipText?: string,
18-
} & ValueProps;
16+
value: ReactElement | string,
17+
};
1918

2019
const InfoPair = ({ label, className, tooltipText, ...props }: Props) => (
2120
<ContainerHorizontal className={className}>

src/domains/misc/components/InteractiveSlider/InteractiveSlider.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ const InteractiveSlider = ({
104104
[0, 1],
105105
);
106106

107-
// console.log(thumbMotion.get(), touchMotion.get(), interactiveAreaWidth);
108-
109107
const {
110108
isHoverThumbVisible,
111109
eventsListeners: hoverThumbEventsListeners,
@@ -154,7 +152,7 @@ const InteractiveSlider = ({
154152
>
155153
<Axis
156154
data={snapPoints.map((snapPoint, i) => ({
157-
text: `${Math.round(snapPoint * 100)}%`,
155+
text: snapPoint === 1 ? 'MAX' : `${Math.round(snapPoint * 100)}%`,
158156
position: snapPointsPositions[i],
159157
}))}
160158
highlightedIndex={hoverSnappedAtIndex}

src/domains/misc/components/InteractiveSlider/utils/useOvershootLimitedSpringMotion.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export default (
1010
return Math.max(0, Math.min(safeX, range));
1111
});
1212

13-
// Применяем spring к ограниченному значению
1413
const bounceBackLimitedSpring = useSpring(clamped, {
1514
damping: 17,
1615
stiffness: 150,

src/domains/misc/components/Layout/Footer.tsx

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import styled from 'styled-components';
22

33
import Button from 'src/domains/misc/components/Button';
4-
import { BREAKPOINTS } from 'src/domains/misc/consts/consts';
4+
import {
5+
BREAKPOINTS,
6+
CHANGELOG_LINK,
7+
FEEDBACK_LINK,
8+
KNOWLEDGE_BASE_LINK, LANDING_PAGE_LINK,
9+
FAUCET_LINK,
10+
} from 'src/domains/misc/consts/consts';
511
import { typography } from 'src/domains/styling/utils/tokens';
612
import vars from 'src/domains/styling/utils/vars';
713

@@ -10,9 +16,18 @@ import ThemeSelector from './ThemeSelector';
1016
const Footer = () => (
1117
<Container>
1218
<ThemeSelector />
13-
<InnerContainer data-chromatic="ignore">
19+
<InnerContainer>
20+
<Link href={FEEDBACK_LINK} target="_blank" rel="noopener noreferrer">Feedback</Link>
21+
<Link href={CHANGELOG_LINK} target="_blank" rel="noopener noreferrer">Changelog</Link>
22+
<Link href={KNOWLEDGE_BASE_LINK} target="_blank" rel="noopener noreferrer">Help center</Link>
23+
<Link href={FAUCET_LINK} target="_blank" rel="noopener noreferrer">
24+
Get Testnet Tokens
25+
</Link>
26+
<Link href={LANDING_PAGE_LINK} target="_blank" rel="noopener noreferrer">common.fi</Link>
27+
</InnerContainer>
28+
<CopyrightContainer data-chromatic="ignore">
1429
<Copyright>
15-
Copyright © {new Date().getFullYear()} Shielder, ver. {import.meta.env.APP_VERSION}
30+
Copyright © {new Date().getFullYear()} Common
1631
</Copyright>
1732
<Button
1833
variant="outline"
@@ -22,7 +37,7 @@ const Footer = () => (
2237
>
2338
DEX and Bridge (WASM)
2439
</Button>
25-
</InnerContainer>
40+
</CopyrightContainer>
2641
</Container>
2742
);
2843

@@ -47,11 +62,14 @@ const InnerContainer = styled.div`
4762
display: flex;
4863
align-items: center;
4964
gap: ${vars('--spacing-xxl')};
50-
justify-content: space-between;
5165
5266
flex-wrap: wrap;
5367
`;
5468

69+
const CopyrightContainer = styled(InnerContainer)`
70+
justify-content: space-between;
71+
`;
72+
5573
const Copyright = styled.div`
5674
width: 100%;
5775
color: ${vars('--color-neutral-foreground-4-rest')};
@@ -61,3 +79,10 @@ const Copyright = styled.div`
6179
width: auto;
6280
}
6381
`;
82+
83+
const Link = styled.a`
84+
color: ${vars('--color-neutral-foreground-4-rest')};
85+
86+
text-decoration: underline;
87+
${typography.web.caption2}
88+
`;

src/domains/misc/components/Layout/Navigation.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import router from 'src/domains/routing/utils/router';
66
const tabsConfig = [
77
{
88
key: 'shield',
9-
label: 'Shield',
9+
label: 'Trace Breaker',
1010
routeNames: ['Shield'],
1111
onClick: () => void router.push('Shield'),
1212
},
1313
{
1414
key: 'yield',
15-
label: 'Yield',
15+
label: 'Shielded Yield',
1616
routeNames: ['Yield'],
1717
onClick: () => void router.push('Yield'),
1818
comingSoon: true,

src/domains/misc/components/Tabs/Tab.tsx

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
import { useMediaQuery } from '@react-hookz/web';
12
import { m as motion } from 'motion/react';
23
import type { ReactElement } from 'react';
34
import styled, { RuleSet } from 'styled-components';
45

56
import Badge from 'src/domains/misc/components/Badge';
7+
import { BOTTOM_MENU_BREAKPOINT } from 'src/domains/misc/consts/consts.ts';
68
import composeFluidSize from 'src/domains/styling/utils/composeFluidSize';
79
import { transitionTime, typography } from 'src/domains/styling/utils/tokens';
810
import vars from 'src/domains/styling/utils/vars';
@@ -36,36 +38,42 @@ const positionStyles = {
3638
},
3739
};
3840

39-
const Tab = ({ label, selected, onClick, layoutId, size = 'medium', position = 'floor', icon, comingSoon }: Props) => (
40-
<Wrapper
41-
initial={{ opacity: 0 }}
42-
animate={{ opacity: 1, transition: { delay: 0.1 }}}
43-
exit={{ opacity: 0 }}
44-
>
45-
<Container
46-
selected={selected}
47-
onClick={onClick}
48-
disabled={comingSoon}
49-
title={label}
50-
$size={size}
51-
layout
41+
const Tab = ({ label, selected, onClick, layoutId, size = 'medium', position = 'floor', icon, comingSoon }: Props) => {
42+
const isSmallScreen = useMediaQuery(`(max-width: ${BOTTOM_MENU_BREAKPOINT})`);
43+
44+
return (
45+
<Wrapper
46+
initial={{ opacity: 0 }}
47+
animate={{ opacity: 1, transition: { delay: 0.1 }}}
48+
exit={{ opacity: 0 }}
5249
>
53-
<LabelContainer>
54-
{icon}
55-
{label}
56-
</LabelContainer>
57-
<HoverBar style={positionStyles[position]} />
58-
{selected && (
59-
<SelectionBar
60-
// set as an inline style for scale correction during transition (https://www.framer.com/motion/layout-animations/##scale-correction)
61-
style={positionStyles[position]}
62-
layoutId={layoutId}
63-
/>
50+
<Container
51+
selected={selected}
52+
onClick={onClick}
53+
disabled={comingSoon}
54+
title={label}
55+
$size={size}
56+
layout
57+
>
58+
<LabelContainer>
59+
{icon}
60+
{label}
61+
</LabelContainer>
62+
<HoverBar style={positionStyles[position]} />
63+
{selected && (
64+
<SelectionBar
65+
// set as an inline style for scale correction during transition (https://www.framer.com/motion/layout-animations/##scale-correction)
66+
style={positionStyles[position]}
67+
layoutId={layoutId}
68+
/>
69+
)}
70+
</Container>
71+
{comingSoon && (
72+
<Badge size="medium" variant="subtle" design="tint" text={isSmallScreen ? 'Soon' : 'Coming soon'} circular />
6473
)}
65-
</Container>
66-
{comingSoon && <Badge size="medium" variant="subtle" design="tint" text="Coming soon" circular />}
67-
</Wrapper>
68-
);
74+
</Wrapper>
75+
);
76+
};
6977

7078
export default Tab;
7179

@@ -102,6 +110,7 @@ const LabelContainer = styled.div`
102110
display: flex;
103111
gap: ${vars('--spacing-xxs')};
104112
align-items: center;
113+
white-space: nowrap;
105114
106115
svg {
107116
fill: ${vars('--color-brand-foreground-compound-rest')};

src/domains/misc/consts/consts.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UseQueryOptions } from '@tanstack/react-query';
22

33
export const BREAKPOINTS = { xs: '355px', sm: '500px', md: '770px', lg: '970px', xl: '1160px' };
44

5-
export const BOTTOM_MENU_BREAKPOINT = BREAKPOINTS.lg;
5+
export const BOTTOM_MENU_BREAKPOINT = '1060px';
66

77
export const BOTTOM_NAVIGATION_HEIGHT = '48px';
88

@@ -13,3 +13,9 @@ export const NEVER_CHANGING_DATA_OPTIONS = {
1313
refetchOnWindowFocus: false,
1414
refetchOnReconnect: false,
1515
} satisfies Omit<UseQueryOptions, 'queryKey' | 'queryFn'>;
16+
17+
export const FAUCET_LINK = 'https://shielder-faucet.vercel.app/';
18+
export const LANDING_PAGE_LINK = 'https://common.fi';
19+
export const KNOWLEDGE_BASE_LINK = 'https://docs.common.fi/knowledge-base';
20+
export const FEEDBACK_LINK='https://feedback.common.fi/?b=67f637404dea52efc92da1a6';
21+
export const CHANGELOG_LINK = 'https://feedback.common.fi/changelog';

src/domains/misc/utils/getQueryKey.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Address } from 'viem';
22

33
const getQueryKey = {
4-
estimateFeesPerGas: (walletAddress: Address) => ['shieldActionFees', walletAddress] as const,
4+
shielderFees: (walletAddress: Address) => ['shielderFees', walletAddress] as const,
55
shielderClient: (chainId: number, shielderPrivateKey: Address) => [
66
'shielder-client',
77
chainId,

0 commit comments

Comments
 (0)