Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
747fe19
Revert "Merge pull request #42965 from suneox/40767-handle-edit-last-…
mananjadhav Jun 6, 2024
8c0912a
Reapply "Merge pull request #42965 from suneox/40767-handle-edit-last…
mananjadhav Jun 6, 2024
2ab267e
Merge branch 'main' of github.com:mananjadhav/App
mananjadhav Jun 6, 2024
b335e64
Merge branch 'main' of github.com:mananjadhav/App
mananjadhav Jun 11, 2024
e8c4fb5
Merge branch 'main' of github.com:mananjadhav/App
mananjadhav Jun 19, 2024
d955084
Merge branch 'main' of github.com:mananjadhav/App
mananjadhav Jun 20, 2024
42a8811
feat: added view payment history button
mananjadhav Jun 20, 2024
a637b42
refactor: lint fixes
mananjadhav Jun 20, 2024
7ddd1ef
feat: add redirect
mananjadhav Jun 20, 2024
7e1fd20
refactor: lint fixes
mananjadhav Jun 20, 2024
0fb0aa0
refactor: added account check
mananjadhav Jun 20, 2024
f71b453
Merge branch 'main' of github.com:mananjadhav/App into mj-subscriptio…
mananjadhav Jun 20, 2024
c1fa970
fix: translation and style
mananjadhav Jun 20, 2024
49edc50
feat: added flag to account object
mananjadhav Jun 20, 2024
235e2bb
Merge branch 'main' of github.com:mananjadhav/App into mj-subscriptio…
mananjadhav Jun 24, 2024
856313b
fix: search url
mananjadhav Jun 24, 2024
f9ad1ec
fix: search page redirect on native
mananjadhav Jun 24, 2024
8dd7bc6
docs: updated comment
mananjadhav Jun 24, 2024
a182d24
refactor: update the comment
mananjadhav Jun 26, 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
1 change: 1 addition & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3279,6 +3279,7 @@ export default {
changeCurrency: 'Change payment currency',
cardNotFound: 'No payment card added',
retryPaymentButton: 'Retry payment',
viewPaymentHistory: 'View payment history',
},
yourPlan: {
title: 'Your plan',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3783,6 +3783,7 @@ export default {
changeCurrency: 'Cambiar moneda de pago',
cardNotFound: 'No se ha añadido ninguna tarjeta de pago',
retryPaymentButton: 'Reintentar el pago',
viewPaymentHistory: 'Ver historial de pagos',
},
yourPlan: {
title: 'Tu plan',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,32 @@ function ResponsiveStackNavigator(props: ResponsiveStackNavigatorProps) {
const {stateToRender, searchRoute} = useMemo(() => {
const routes = reduceCentralPaneRoutes(state.routes);

// On narrow layout, if we are on /search route we want to hide the search central pane route.
if (isSmallScreenWidth) {
const isSearchCentralPane = (route: RouteProp<ParamListBase>) => getTopmostCentralPaneRoute({routes: [route]} as State<RootStackParamList>)?.name === SCREENS.SEARCH.CENTRAL_PANE;

const lastRoute = routes[routes.length - 1];
const lastSearchCentralPane = isSearchCentralPane(lastRoute) ? lastRoute : undefined;
const filteredRoutes = routes.filter((route) => !isSearchCentralPane(route));

// On narrow layout, if we are on /search route we want to hide all central pane routes and show only the bottom tab navigator.
if (lastSearchCentralPane) {
return {
stateToRender: {
...state,
index: 0,
routes: [filteredRoutes[0]],
},
searchRoute: lastSearchCentralPane,
};
}

return {
stateToRender: {
...state,
index: filteredRoutes.length - 1,
routes: filteredRoutes,
},
searchRoute: lastSearchCentralPane,
searchRoute: undefined,
};
}

Expand Down
18 changes: 18 additions & 0 deletions src/pages/settings/Subscription/CardSection/CardSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@ import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import MenuItem from '@components/MenuItem';
import Section from '@components/Section';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import DateUtils from '@libs/DateUtils';
import Navigation from '@libs/Navigation/Navigation';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import PreTrialBillingBanner from './BillingBanner/PreTrialBillingBanner';
import CardSectionActions from './CardSectionActions';
Expand All @@ -21,6 +25,7 @@ function CardSection() {
const styles = useThemeStyles();
const theme = useTheme();
const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);

const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.isDefault), [fundList]);
Expand Down Expand Up @@ -67,6 +72,19 @@ function CardSection() {
)}
{isEmptyObject(defaultCard?.accountData) && <CardSectionDataEmpty />}
</View>
{!!account?.hasPurchases && (
<MenuItem
shouldShowRightIcon
icon={Expensicons.History}
iconStyles={[]}
wrapperStyle={styles.sectionMenuItemTopDescription}
style={styles.mt5}
title={translate('subscription.cardSection.viewPaymentHistory')}
titleStyle={styles.textStrong}
onPress={() => Navigation.navigate(ROUTES.SEARCH.getRoute(CONST.SEARCH.TAB.ALL))}
hoverAndPressStyle={styles.hoveredComponentBG}
/>
)}
</Section>
);
}
Expand Down
3 changes: 3 additions & 0 deletions src/types/onyx/Account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ type Account = {

/** Indicates whether the user can downgrade current subscription plan */
canDowngrade?: boolean;

/** Indicates whether the user has at least one previous purchase */
hasPurchases?: boolean;
};

export default Account;
Expand Down