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: Update copy menu styles #1750

Merged
merged 3 commits into from
Feb 29, 2024
Merged

fix: Update copy menu styles #1750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a930366
fix: Update copy menu styles
devkudasov Feb 27, 2024
75e2781
fix: Update copy menu components
devkudasov Feb 29, 2024
c145322
Merge branch 'main' into fix/HQM-347-copy-menu
devkudasov Feb 29, 2024
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
32 changes: 17 additions & 15 deletions src/components/ui/copy-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ import {
import {Color} from '@app/colors';
import {Icon, IconsName} from '@app/components/ui/icon';
import Popover from '@app/components/ui/popover';
import {Text} from '@app/components/ui/text';
import {Text, TextVariant} from '@app/components/ui/text';
import {createTheme} from '@app/helpers';
import {AddressUtils} from '@app/helpers/address-utils';
import {useTypedNavigation} from '@app/hooks';
import {I18N} from '@app/i18n';
import {sendNotification} from '@app/services';
import {PLACEHOLDER_GRAY} from '@app/variables/common';

export type CopyMenuProps = ViewProps & {
value: string;
Expand Down Expand Up @@ -73,21 +72,23 @@ export const CopyMenu = ({
optionsContainerStyle={styles.optionsContainer}
customStyles={optionCustomStyles}>
<MenuOption onSelect={onCopyPress} style={styles.option}>
<Text t11 i18n={I18N.copyAddress} />
<Icon i18 name={IconsName.copy} color={Color.textBase1} />
<Text variant={TextVariant.t11} i18n={I18N.copyAddress} />
<Icon i22 name={IconsName.copy} color={Color.textBase1} />
</MenuOption>
<View style={styles.divider} />
<MenuOption onSelect={onBech32CopyPress} style={styles.option}>
<Text t11 i18n={I18N.copyBech32Address} />
<Text variant={TextVariant.t11} i18n={I18N.copyBech32Address} />
<View style={styles.horizontalSpace} />
<Icon i18 name={IconsName.copy} color={Color.textBase1} />
<Icon i22 name={IconsName.copy} color={Color.textBase1} />
</MenuOption>
{withSettings && <View style={styles.divider} />}
{withSettings && (
<MenuOption onSelect={onPressSettings} style={styles.option}>
<Text t11 i18n={I18N.homeSettingsTitle} />
<Icon i18 name={IconsName.settings} color={Color.textBase1} />
</MenuOption>
<>
<View style={styles.divider} />
devkudasov marked this conversation as resolved.
Show resolved Hide resolved
<MenuOption onSelect={onPressSettings} style={styles.option}>
<Text variant={TextVariant.t11} i18n={I18N.homeSettingsTitle} />
<Icon i22 name={IconsName.settings} color={Color.textBase1} />
</MenuOption>
</>
)}
</MenuOptions>
</Menu>
Expand All @@ -99,17 +100,18 @@ const styles = createTheme({
flexDirection: 'row',
alignItems: 'center',
},
divider: {height: 1, width: '100%', backgroundColor: PLACEHOLDER_GRAY},
divider: {height: 1, width: '100%', backgroundColor: Color.graphicSecond2},
optionsContainer: {
borderRadius: 8,
backgroundColor: Color.bg3,
borderRadius: 12,
backgroundColor: Color.graphicSecond1,
transform: [{translateX: -32}],
ragozin-nikita marked this conversation as resolved.
Show resolved Hide resolved
},
horizontalSpace: {width: 16},
option: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
margin: 8,
backgroundColor: Color.bg3,
backgroundColor: Color.transparent,
},
});
6 changes: 6 additions & 0 deletions src/components/wallet-card/card-name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ export const CardName = ({
color={Color.graphicBase3}
style={styles.marginLeft}
/>
<Icon
i16
name={IconsName.more}
color={Color.graphicBase3}
style={styles.marginLeft}
/>
</CopyMenu>
</View>
);
Expand Down
Loading