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 missing header height from wallet list height calculation #6315

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Fix missing header height from wallet list height calculation #6315

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
15 changes: 9 additions & 6 deletions src/components/change-wallet/WalletList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { useTheme } from '@/theme';
import { DEVICE_HEIGHT } from '@/utils/deviceUtils';

const listTopPadding = 7.5;
const rowHeight = 59;
const listBottomPadding = 9.5;
const transitionDuration = 75;

const RowTypes = {
Expand Down Expand Up @@ -66,7 +66,7 @@ const EmptyWalletList = styled(EmptyAssetList).attrs({

const WalletFlatList: FlatList = styled(FlatList).attrs(({ showDividers }: { showDividers: boolean }) => ({
contentContainerStyle: {
paddingBottom: showDividers ? 9.5 : 0,
paddingBottom: showDividers ? listBottomPadding : 0,
paddingTop: listTopPadding,
},
getItemLayout,
Expand Down Expand Up @@ -118,15 +118,18 @@ const EditButtonLabel = styled(Text).attrs(({ theme: { colors }, editMode }: { t
height: 40,
});

const HEADER_HEIGHT = 40;
const FOOTER_HEIGHT = getExperimetalFlag(HARDWARE_WALLETS) ? 100 : 60;
const LIST_PADDING_BOTTOM = 6;
export const MAX_LIST_HEIGHT = DEVICE_HEIGHT - 220;
const WALLET_ROW_HEIGHT = 59;
const WATCH_ONLY_BOTTOM_PADDING = IS_ANDROID ? 20 : 0;

const getWalletListHeight = (numWallets: number, watchOnly: boolean) => {
const baseHeight = !watchOnly ? FOOTER_HEIGHT + LIST_PADDING_BOTTOM : WATCH_ONLY_BOTTOM_PADDING;
const calculatedHeight = baseHeight + numWallets * (WALLET_ROW_HEIGHT + 6);
const baseHeight = !watchOnly ? FOOTER_HEIGHT + LIST_PADDING_BOTTOM + HEADER_HEIGHT : WATCH_ONLY_BOTTOM_PADDING;
const paddingBetweenRows = 6 * (numWallets - 1);
const rowHeight = WALLET_ROW_HEIGHT * numWallets;
const calculatedHeight = baseHeight + rowHeight + paddingBetweenRows;
return Math.min(calculatedHeight, MAX_LIST_HEIGHT);
};

Expand Down Expand Up @@ -181,7 +184,7 @@ export default function WalletList({
const row = {
...account,
editMode,
height: rowHeight,
height: WALLET_ROW_HEIGHT,
id: account.address,
isOnlyAddress: filteredAccounts.length === 1,
isReadOnly: wallet.type === WalletTypes.readOnly,
Expand Down Expand Up @@ -264,7 +267,7 @@ export default function WalletList({

return (
<Container height={containerHeight}>
<Column height={40} justify="space-between">
<Column height={HEADER_HEIGHT} justify="space-between">
<Centered>
<SheetTitle testID="change-wallet-sheet-title">{lang.t('wallet.label')}</SheetTitle>

Expand Down
1 change: 0 additions & 1 deletion src/screens/AddWalletSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import CreateNewWallet from '@/assets/CreateNewWallet.png';
import PairHairwareWallet from '@/assets/PairHardwareWallet.png';
import ImportSecretPhraseOrPrivateKey from '@/assets/ImportSecretPhraseOrPrivateKey.png';
import WatchWalletIcon from '@/assets/watchWallet.png';
import { captureException } from '@sentry/react-native';
import { useDispatch } from 'react-redux';
import {
backupUserDataIntoCloud,
Expand Down
1 change: 0 additions & 1 deletion src/screens/ChangeWalletSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { useTheme } from '@/theme';
import { EthereumAddress } from '@/entities';
import { getNotificationSettingsForWalletWithAddress } from '@/notifications/settings/storage';
import { remotePromoSheetsStore } from '@/state/remotePromoSheets/remotePromoSheets';
import { DebugLayout } from '@/design-system';

export type EditWalletContextMenuActions = {
edit: (walletId: string, address: EthereumAddress) => void;
Expand Down
Loading