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

Mobile Trade: Token picker modal visual stub #16668

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open
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
3 changes: 2 additions & 1 deletion packages/theme/src/spacings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const spacingsPx = (Object.keys(spacings) as Array<Spacing>).reduce((resu
return result;
}, {} as SpacingPx);

type NativeSpacingValue = 1 | 2 | 4 | 8 | 12 | 16 | 20 | 24 | 32 | 40 | 52 | 64;
type NativeSpacingValue = 1 | 2 | 4 | 8 | 12 | 16 | 20 | 24 | 32 | 36 | 40 | 52 | 64;
PeKne marked this conversation as resolved.
Show resolved Hide resolved

export const nativeSpacings = {
sp1: 1,
Expand All @@ -55,6 +55,7 @@ export const nativeSpacings = {
sp20: 20,
sp24: 24,
sp32: 32,
sp36: 36,
sp40: 40,
sp52: 52,
sp64: 64,
Expand Down
3 changes: 3 additions & 0 deletions suite-common/icons/generateIconFont.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const usedIcons = [
'arrowLineUpRight',
'arrowRight',
'arrowsCounterClockwise',
'arrowsDownUp',
'arrowsLeftRight',
'arrowSquareOut',
'arrowUp',
Expand Down Expand Up @@ -93,6 +94,8 @@ const usedIcons = [
'shieldWarning',
'shuffle',
'stack',
'star',
'starFilled',
'swap',
'trashSimple',
'treeStructure',
Expand Down
163 changes: 83 additions & 80 deletions suite-common/icons/iconFontsMobile/TrezorSuiteIcons.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,84 +20,87 @@
"treeStructure": 61715,
"trashSimple": 61716,
"swap": 61717,
"stack": 61718,
"shuffle": 61719,
"shieldWarning": 61720,
"shieldCheck": 61721,
"shareNetwork": 61722,
"question": 61723,
"qrCode": 61724,
"prohibit": 61725,
"plusCircle": 61726,
"plus": 61727,
"plugs": 61728,
"piggyBankFilled": 61729,
"piggyBank": 61730,
"pictureFrame": 61731,
"pencilSimpleLine": 61732,
"pencilSimple": 61733,
"pencil": 61734,
"password": 61735,
"palette": 61736,
"magnifyingGlass": 61737,
"lock": 61738,
"link": 61739,
"lightbulb": 61740,
"lifebuoy": 61741,
"info": 61742,
"image": 61743,
"houseFilled": 61744,
"house": 61745,
"handPalm": 61746,
"githubLogo": 61747,
"gearFilled": 61748,
"gear": 61749,
"flagCheckered": 61750,
"flag": 61751,
"fingerprintSimple": 61752,
"fingerprint": 61753,
"filePdf": 61754,
"facebookLogo": 61755,
"eyeSlash": 61756,
"eye": 61757,
"discoverFilled": 61758,
"discover": 61759,
"detective": 61760,
"database": 61761,
"cpu": 61762,
"copy": 61763,
"coins": 61764,
"coinVerticalCheck": 61765,
"code": 61766,
"clockClockwise": 61767,
"circleDashed": 61768,
"checks": 61769,
"checkCircleFilled": 61770,
"checkCircle": 61771,
"check": 61772,
"chatCircle": 61773,
"change": 61774,
"caretUpFilled": 61775,
"caretUpDown": 61776,
"caretUp": 61777,
"caretRight": 61778,
"caretLeft": 61779,
"caretDownFilled": 61780,
"caretDown": 61781,
"caretCircleRight": 61782,
"calendar": 61783,
"bugBeetle": 61784,
"bookmarkSimple": 61785,
"backspace": 61786,
"arrowsLeftRight": 61787,
"arrowsCounterClockwise": 61788,
"arrowUpRight": 61789,
"arrowUp": 61790,
"arrowURightDown": 61791,
"arrowSquareOut": 61792,
"arrowRight": 61793,
"arrowLineUpRight": 61794,
"arrowLineUp": 61795,
"arrowLineDown": 61796,
"arrowDown": 61797
"starFilled": 61718,
"star": 61719,
"stack": 61720,
"shuffle": 61721,
"shieldWarning": 61722,
"shieldCheck": 61723,
"shareNetwork": 61724,
"question": 61725,
"qrCode": 61726,
"prohibit": 61727,
"plusCircle": 61728,
"plus": 61729,
"plugs": 61730,
"piggyBankFilled": 61731,
"piggyBank": 61732,
"pictureFrame": 61733,
"pencilSimpleLine": 61734,
"pencilSimple": 61735,
"pencil": 61736,
"password": 61737,
"palette": 61738,
"magnifyingGlass": 61739,
"lock": 61740,
"link": 61741,
"lightbulb": 61742,
"lifebuoy": 61743,
"info": 61744,
"image": 61745,
"houseFilled": 61746,
"house": 61747,
"handPalm": 61748,
"githubLogo": 61749,
"gearFilled": 61750,
"gear": 61751,
"flagCheckered": 61752,
"flag": 61753,
"fingerprintSimple": 61754,
"fingerprint": 61755,
"filePdf": 61756,
"facebookLogo": 61757,
"eyeSlash": 61758,
"eye": 61759,
"discoverFilled": 61760,
"discover": 61761,
"detective": 61762,
"database": 61763,
"cpu": 61764,
"copy": 61765,
"coins": 61766,
"coinVerticalCheck": 61767,
"code": 61768,
"clockClockwise": 61769,
"circleDashed": 61770,
"checks": 61771,
"checkCircleFilled": 61772,
"checkCircle": 61773,
"check": 61774,
"chatCircle": 61775,
"change": 61776,
"caretUpFilled": 61777,
"caretUpDown": 61778,
"caretUp": 61779,
"caretRight": 61780,
"caretLeft": 61781,
"caretDownFilled": 61782,
"caretDown": 61783,
"caretCircleRight": 61784,
"calendar": 61785,
"bugBeetle": 61786,
"bookmarkSimple": 61787,
"backspace": 61788,
"arrowsLeftRight": 61789,
"arrowsDownUp": 61790,
"arrowsCounterClockwise": 61791,
"arrowUpRight": 61792,
"arrowUp": 61793,
"arrowURightDown": 61794,
"arrowSquareOut": 61795,
"arrowRight": 61796,
"arrowLineUpRight": 61797,
"arrowLineUp": 61798,
"arrowLineDown": 61799,
"arrowDown": 61800
}
Binary file modified suite-common/icons/iconFontsMobile/TrezorSuiteIcons.ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions suite-common/suite-utils/src/hexToRgba.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ export function hexToRgba(hex: string, alpha: number) {
const b = parseInt(hex.slice(5, 7), 16);

if (alpha > 0) {
return `rgba(${r}, ${g}, ${b}, ${alpha})`;
return `rgba(${r}, ${g}, ${b}, ${alpha})` as `rgba(${number}, ${number}, ${number}, ${number})`;
}

return `rgb(${r}, ${g}, ${b})`;
return `rgb(${r}, ${g}, ${b})` as `rgb(${number}, ${number}, ${number})`;
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ export const AccountSelectBottomSheet = React.memo(
return (
<BottomSheetFlashList<AccountSelectBottomSheetSection>
isVisible
isCloseDisplayed={false}
onClose={onClose}
data={data}
renderItem={renderItem}
Expand Down
2 changes: 1 addition & 1 deletion suite-native/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export default ({ config }: ConfigContext): ExpoConfig => {
slug: appSlugs[buildType],
owner: appOwners[buildType],
version: suiteNativeVersion,
runtimeVersion: '24',
runtimeVersion: '26',
...(buildType === 'production'
? {}
: {
Expand Down
10 changes: 9 additions & 1 deletion suite-native/atoms/src/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ export type ButtonColorScheme =
| 'yellowElevation1'
| 'blueBold'
| 'blueElevation0'
| 'blueElevation1';
| 'blueElevation1'
| 'backgroundSurfaceElevation0';

export type ButtonProps = Omit<PressableProps, 'style' | 'onPressIn' | 'onPressOut'> & {
children: ReactNode;
Expand Down Expand Up @@ -181,6 +182,13 @@ export const buttonSchemeToColorsMap = {
iconColor: 'iconAlertBlue',
disabledColors: baseDisabledScheme,
},
backgroundSurfaceElevation0: {
backgroundColor: 'backgroundSurfaceElevation0',
onPressColor: 'backgroundTertiaryPressedOnElevation0',
textColor: 'textSubdued',
iconColor: 'textSubdued',
disabledColors: baseDisabledScheme,
},
} as const satisfies Record<ButtonColorScheme, ButtonColorSchemeColors>;

const sizeToDimensionsMap = {
Expand Down
Loading
Loading