From 77548f3f2963b3a62b217953c7ebc6e82f227fde Mon Sep 17 00:00:00 2001 From: Michal Muzyk Date: Mon, 10 Jun 2024 10:05:11 +0200 Subject: [PATCH 1/2] fix: display FullPageNotFoundView on mobile for subscription size page --- .../ModalStackNavigators/index.tsx | 2 +- .../Subscription/SubscriptionSettingsPage.tsx | 1 + .../SubscriptionSize/index.native.tsx | 19 +++++++++++++++++++ .../{SubscriptionSizePage.tsx => index.tsx} | 0 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/pages/settings/Subscription/SubscriptionSize/index.native.tsx rename src/pages/settings/Subscription/SubscriptionSize/{SubscriptionSizePage.tsx => index.tsx} (100%) diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 807c938e21dd..dea1fede3fe1 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -217,7 +217,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/settings/Profile/CustomStatus/StatusClearAfterPage').default as React.ComponentType, [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: () => require('../../../../pages/settings/Profile/CustomStatus/SetDatePage').default as React.ComponentType, [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_TIME]: () => require('../../../../pages/settings/Profile/CustomStatus/SetTimePage').default as React.ComponentType, - [SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: () => require('../../../../pages/settings/Subscription/SubscriptionSize/SubscriptionSizePage').default as React.ComponentType, + [SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: () => require('../../../../pages/settings/Subscription/SubscriptionSize').default as React.ComponentType, [SCREENS.SETTINGS.SUBSCRIPTION.DISABLE_AUTO_RENEW_SURVEY]: () => require('../../../../pages/settings/Subscription/DisableAutoRenewSurveyPage').default as React.ComponentType, [SCREENS.WORKSPACE.RATE_AND_UNIT]: () => require('../../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage').default as React.ComponentType, [SCREENS.WORKSPACE.RATE_AND_UNIT_RATE]: () => require('../../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage').default as React.ComponentType, diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx index c0a280f35e99..38825403b86b 100644 --- a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx +++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx @@ -12,6 +12,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions'; import Navigation from '@libs/Navigation/Navigation'; import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; import * as Subscription from '@userActions/Subscription'; +import ROUTES from '@src/ROUTES'; import CardSection from './CardSection/CardSection'; import ReducedFunctionalityMessage from './ReducedFunctionalityMessage'; import SubscriptionDetails from './SubscriptionDetails'; diff --git a/src/pages/settings/Subscription/SubscriptionSize/index.native.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.native.tsx new file mode 100644 index 000000000000..3afd51298551 --- /dev/null +++ b/src/pages/settings/Subscription/SubscriptionSize/index.native.tsx @@ -0,0 +1,19 @@ +import React from 'react'; +import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; +import ScreenWrapper from '@components/ScreenWrapper'; + +function SubscriptionSizePage() { + return ( + + + + ); +} + +SubscriptionSizePage.displayName = 'SubscriptionSizePage'; + +export default SubscriptionSizePage; diff --git a/src/pages/settings/Subscription/SubscriptionSize/SubscriptionSizePage.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.tsx similarity index 100% rename from src/pages/settings/Subscription/SubscriptionSize/SubscriptionSizePage.tsx rename to src/pages/settings/Subscription/SubscriptionSize/index.tsx From d11ce00bb3af98b097635d993ec94e33a6bfb649 Mon Sep 17 00:00:00 2001 From: Michal Muzyk Date: Mon, 10 Jun 2024 10:39:05 +0200 Subject: [PATCH 2/2] fix: linter --- src/pages/settings/Subscription/SubscriptionSettingsPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx index 38825403b86b..c0a280f35e99 100644 --- a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx +++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx @@ -12,7 +12,6 @@ import useWindowDimensions from '@hooks/useWindowDimensions'; import Navigation from '@libs/Navigation/Navigation'; import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; import * as Subscription from '@userActions/Subscription'; -import ROUTES from '@src/ROUTES'; import CardSection from './CardSection/CardSection'; import ReducedFunctionalityMessage from './ReducedFunctionalityMessage'; import SubscriptionDetails from './SubscriptionDetails';