Skip to content

Fix WalletPage scrollbar #48786

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

Merged
mountiny merged 2 commits into from
Sep 11, 2024
Merged

Fix WalletPage scrollbar #48786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
554f8df
migrate WalletPage to `useOnyx`
war-in Sep 9, 2024
bf4ab28
Merge branch 'main' into war-in/fix-wallet-scrollbar
war-in Sep 11, 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
37 changes: 11 additions & 26 deletions src/pages/settings/Wallet/WalletPage/WalletPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type {ForwardedRef, RefObject} from 'react';
import React, {useCallback, useEffect, useLayoutEffect, useRef, useState} from 'react';
import type {GestureResponderEvent} from 'react-native';
import {ActivityIndicator, Dimensions, View} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import {useOnyx} from 'react-native-onyx';
import AddPaymentMethodMenu from '@components/AddPaymentMethodMenu';
import ConfirmModal from '@components/ConfirmModal';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
Expand Down Expand Up @@ -40,7 +40,7 @@ import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {AccountData} from '@src/types/onyx';
import type {FormattedSelectedPaymentMethodIcon, WalletPageOnyxProps, WalletPageProps} from './types';
import type {FormattedSelectedPaymentMethodIcon, WalletPageProps} from './types';

type FormattedSelectedPaymentMethod = {
title: string;
Expand All @@ -57,7 +57,14 @@ type PaymentMethodState = {
selectedPaymentMethodType: string;
};

function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadingPaymentMethods = true, shouldListenForResize = false, userWallet, walletTerms = {}}: WalletPageProps) {
function WalletPage({shouldListenForResize = false}: WalletPageProps) {
const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {initialValue: {}});
const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {initialValue: {}});
const [fundList] = useOnyx(ONYXKEYS.FUND_LIST, {initialValue: {}});
const [isLoadingPaymentMethods] = useOnyx(ONYXKEYS.IS_LOADING_PAYMENT_METHODS, {initialValue: true});
const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET);
const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS, {initialValue: {}});

const theme = useTheme();
const styles = useThemeStyles();
const {translate} = useLocalize();
Expand Down Expand Up @@ -617,26 +624,4 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi

WalletPage.displayName = 'WalletPage';

export default withOnyx<WalletPageProps, WalletPageOnyxProps>({
cardList: {
key: ONYXKEYS.CARD_LIST,
},
walletTransfer: {
key: ONYXKEYS.WALLET_TRANSFER,
},
Comment on lines -624 to -626
Copy link
Copy Markdown
Contributor

@hoangzinh hoangzinh Sep 11, 2024

Choose a reason for hiding this comment

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

We're missing this onyx key when migrating to useOnyx hook. Can you double-check whether it's redundant or we need it to trigger re-render in component, then use it indirectly in util functions?

Copy link
Copy Markdown
Contributor

@mountiny mountiny Sep 15, 2024

Choose a reason for hiding this comment

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

@war-in Can you please check this? @hoangzinh have you find any issues with this?

userWallet: {
key: ONYXKEYS.USER_WALLET,
},
bankAccountList: {
key: ONYXKEYS.BANK_ACCOUNT_LIST,
},
fundList: {
key: ONYXKEYS.FUND_LIST,
},
walletTerms: {
key: ONYXKEYS.WALLET_TERMS,
},
isLoadingPaymentMethods: {
key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
},
})(WalletPage);
export default WalletPage;
28 changes: 2 additions & 26 deletions src/pages/settings/Wallet/WalletPage/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,7 @@
import type {ViewStyle} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import type {BankAccountList, CardList, FundList, UserWallet, WalletTerms, WalletTransfer} from '@src/types/onyx';
import type IconAsset from '@src/types/utils/IconAsset';

type WalletPageOnyxProps = {
/** Wallet balance transfer props */
walletTransfer: OnyxEntry<WalletTransfer>;

/** The user's wallet account */
userWallet: OnyxEntry<UserWallet>;

/** List of bank accounts */
bankAccountList: OnyxEntry<BankAccountList>;

/** List of user's cards */
fundList: OnyxEntry<FundList>;

/** Information about the user accepting the terms for payments */
walletTerms: OnyxEntry<WalletTerms>;

cardList: OnyxEntry<CardList>;

/** Are we loading payment methods? */
isLoadingPaymentMethods: OnyxEntry<boolean>;
};

type WalletPageProps = WalletPageOnyxProps & {
type WalletPageProps = {
/** Listen for window resize event on web and desktop. */
shouldListenForResize?: boolean;
};
Expand All @@ -38,4 +14,4 @@ type FormattedSelectedPaymentMethodIcon = {
iconSize?: number;
};

export type {WalletPageOnyxProps, WalletPageProps, FormattedSelectedPaymentMethodIcon};
export type {WalletPageProps, FormattedSelectedPaymentMethodIcon};