Skip to content

fix: fix multi rpc modal design #11720

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

Closed
wants to merge 1 commit into from
Closed

fix: fix multi rpc modal design #11720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions ...library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
"alignItems": "center",
"backgroundColor": "#ffffff",
"flexDirection": "row",
"paddingRight": 20,
"width": "100%",
}
}
>
<TouchableOpacity
disabled={false}
style={
{
"flex": 1,
"opacity": 1,
"padding": 16,
"position": "relative",
"width": "90%",
"zIndex": 1,
}
}
Expand Down
4 changes: 1 addition & 3 deletions ...ent-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ const styleSheet = (params: {
return StyleSheet.create({
base: Object.assign(
{
flex: 1,
position: 'relative',
opacity: isDisabled ? 0.5 : 1,
padding: 16,
width: '90%',
zIndex: 1,
} as ViewStyle,
style,
Expand Down Expand Up @@ -71,10 +71,8 @@ const styleSheet = (params: {
backgroundColor: isSelected
? colors.primary.muted
: colors.background.default,
paddingRight: 20,
flexDirection: 'row',
alignItems: 'center',
width: '100%',
},
itemColumn: {
display: 'flex',
Expand Down
6 changes: 4 additions & 2 deletions ...nent-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ describe('ListItemMultiSelectButton', () => {
<ListItemMultiSelectButton
onPress={mockOnPress}
buttonProps={{
onButtonClick: mockOnPress,
label: '',
onPress: mockOnPress,
}}
>
<View />
Expand All @@ -67,7 +68,8 @@ describe('ListItemMultiSelectButton', () => {
<ListItemMultiSelectButton
buttonIcon={IconName.Check}
buttonProps={{
onButtonClick: mockOnButtonClick,
label: '',
onPress: mockOnButtonClick,
}}
>
<View />
Expand Down
8 changes: 4 additions & 4 deletions ...component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,20 @@ const ListItemMultiSelectButton: React.FC<ListItemMultiSelectButtonProps> = ({
iconName={buttonIcon}
iconColor={IconColor.Default}
testID={BUTTON_TEST_ID}
onPress={buttonProps?.onButtonClick}
onPress={buttonProps?.onPress}
accessibilityRole="button"
/>
</View>
) : null}
{buttonProps?.textButton ? (
{buttonProps?.label ? (
<View>
<Button
variant={ButtonVariants.Link}
onPress={buttonProps?.onButtonClick as () => void}
onPress={buttonProps?.onPress as () => void}
labelTextVariant={TextVariant.BodyMD}
size={ButtonSize.Lg}
width={ButtonWidthTypes.Auto}
label={buttonProps?.textButton}
label={buttonProps?.label}
/>
</View>
) : null}
Expand Down
16 changes: 5 additions & 11 deletions ...nent-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { TouchableOpacityProps } from 'react-native';
// External dependencies.
import { IconName } from '../../../component-library/components/Icons/Icon';
import { ListItemProps } from '../../../component-library/components/List/ListItem/ListItem.types';
import { GestureResponderEvent } from 'react-native-modal';
import { ButtonBaseProps } from '../../../component-library/components/Buttons/Button/foundation/ButtonBase';

/**
* ListItemMultiSelect component props.
Expand Down Expand Up @@ -41,16 +41,10 @@ export interface ListItemMultiSelectButtonProps
*/
showButtonIcon?: boolean;

buttonProps?: {
/**
* Optional button onClick function
*/
onButtonClick?: ((event: GestureResponderEvent) => void) | undefined;
/**
* Optional property to show text button
*/
textButton?: string | null;
};
/**
* Optional button props
*/
buttonProps?: ButtonBaseProps;
Copy link
Contributor

@brianacnguyen brianacnguyen Oct 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its better to use ButtonProps

}

/**
Expand Down
4 changes: 1 addition & 3 deletions ...ents-temp/ListItemMultiSelectButton/__snapshots__/ListItemMultiSelectButton.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@ exports[`ListItemMultiSelectButton should render correctly with default props 1`
"alignItems": "center",
"backgroundColor": "#ffffff",
"flexDirection": "row",
"paddingRight": 20,
"width": "100%",
}
}
>
<TouchableOpacity
disabled={false}
style={
{
"flex": 1,
"opacity": 1,
"padding": 16,
"position": "relative",
"width": "90%",
"zIndex": 1,
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/components/Views/MultiRpcModal/MultiRpcModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ const MultiRpcModal = () => {
buttonIcon={IconName.MoreVertical}
showButtonIcon={false}
buttonProps={{
textButton: strings('transaction.edit'),
onButtonClick: () => {
label: strings('transaction.edit'),
onPress: () => {
sheetRef.current?.onCloseBottomSheet(() => {
navigate(Routes.ADD_NETWORK, {
shouldNetworkSwitchPopToWallet: false,
Expand Down
12 changes: 8 additions & 4 deletions app/components/Views/NetworkSelector/NetworkSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,8 @@ const NetworkSelector = () => {
style={styles.networkCell}
buttonIcon={IconName.MoreVertical}
buttonProps={{
onButtonClick: () => {
label: '',
onPress: () => {
openModal(chainId, false, MAINNET, true);
},
}}
Expand Down Expand Up @@ -444,7 +445,8 @@ const NetworkSelector = () => {
buttonIcon={IconName.MoreVertical}
secondaryText={hideKeyFromUrl(LINEA_DEFAULT_RPC_URL)}
buttonProps={{
onButtonClick: () => {
label: '',
onPress: () => {
openModal(chainId, false, LINEA_MAINNET, true);
},
}}
Expand Down Expand Up @@ -508,7 +510,8 @@ const NetworkSelector = () => {
buttonIcon={IconName.MoreVertical}
secondaryText={hideProtocolFromUrl(hideKeyFromUrl(rpcUrl))}
buttonProps={{
onButtonClick: () => {
label: '',
onPress: () => {
openModal(chainId, true, rpcUrl, false);
},
}}
Expand Down Expand Up @@ -580,7 +583,8 @@ const NetworkSelector = () => {
style={styles.networkCell}
buttonIcon={IconName.MoreVertical}
buttonProps={{
onButtonClick: () => {
label: '',
onPress: () => {
openModal(chainId, false, networkType, true);
},
}}
Expand Down
Loading