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.

Sign up for GitHub

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

fix(ui-ux): add linear gradient to from address on evm #4113

Merged
merged 2 commits into from
Nov 9, 2023
Merged

fix(ui-ux): add linear gradient to from address on evm #4113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b92e7d9
fix(ui-ux): add linear gradient to from address on evm
lykalabrada Oct 26, 2023
70c61ec
move from address and label into a separate component
lykalabrada Nov 1, 2023
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
82 changes: 52 additions & 30 deletions mobile-app/app/components/SummaryTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,29 +99,33 @@ export function SummaryTitle(props: ISummaryTitleProps): JSX.Element {
>
{translate("screens/common", "From")}
</ThemedTextV2>
<ThemedViewV2
dark={tailwind("bg-mono-dark-v2-200")}
light={tailwind("bg-mono-light-v2-200")}
style={tailwind(
"rounded-full pl-1 pr-2.5 py-1 flex flex-row items-center overflow-hidden ml-2",
)}
>
<RandomAvatar name={props.fromAddress} size={20} />
<ThemedTextV2
ellipsizeMode="middle"
numberOfLines={1}
style={[
tailwind("text-sm font-normal-v2 ml-1"),
{
minWidth: 10,
maxWidth: 108,
},
]}
testID="wallet_address"

{props.isEvmToken ? (
// EVM from address
<AddressEvmTag
customStyle="flex flex-row items-center rounded-full pr-2.5 py-1 ml-2 overflow-hidden"
testID="from_address_label"
>
{props.fromAddressLabel ?? props.fromAddress}
</ThemedTextV2>
</ThemedViewV2>
<FromAddress
fromAddress={props.fromAddress}
fromAddressLabel={props.fromAddressLabel}
/>
</AddressEvmTag>
) : (
// DVM from address
<ThemedViewV2
dark={tailwind("bg-mono-dark-v2-200")}
light={tailwind("bg-mono-light-v2-200")}
style={tailwind(
"rounded-full pl-1 pr-2.5 py-1 flex flex-row items-center overflow-hidden ml-2",
)}
>
<FromAddress
fromAddress={props.fromAddress}
fromAddressLabel={props.fromAddressLabel}
/>
</ThemedViewV2>
)}
</View>
)}

Expand Down Expand Up @@ -162,10 +166,8 @@ export function SummaryTitle(props: ISummaryTitleProps): JSX.Element {
tailwind(
"text-mono-light-v2-00 text-sm font-normal-v2 tracking-[0.24]",
),
{
minWidth: 10,
maxWidth: 108,
},
// eslint-disable-next-line react-native/no-inline-styles
{ minWidth: 10, maxWidth: 108 },
]}
light={tailwind("text-mono-light-v2-1000")}
dark={tailwind("text-mono-dark-v2-1000")}
Expand Down Expand Up @@ -198,10 +200,7 @@ export function SummaryTitle(props: ISummaryTitleProps): JSX.Element {
style={[
tailwind("text-sm font-normal-v2"),
// eslint-disable-next-line react-native/no-inline-styles
{
minWidth: 10,
maxWidth: 108,
},
{ minWidth: 10, maxWidth: 108 },
]}
light={tailwind("text-mono-light-v2-900")}
dark={tailwind("text-mono-dark-v2-900")}
Expand All @@ -217,3 +216,26 @@ export function SummaryTitle(props: ISummaryTitleProps): JSX.Element {
</>
);
}

function FromAddress(props: {
fromAddress: string;
fromAddressLabel?: string | null;
}): JSX.Element {
return (
<>
<RandomAvatar name={props.fromAddress} size={20} />
<ThemedTextV2
ellipsizeMode="middle"
numberOfLines={1}
style={[
tailwind("text-sm font-normal-v2 ml-1"),
// eslint-disable-next-line react-native/no-inline-styles
{ minWidth: 10, maxWidth: 108 },
]}
testID="wallet_address"
>
{props.fromAddressLabel ?? props.fromAddress}
</ThemedTextV2>
</>
);
}
Loading