Skip to content

Leave the #admins room text unlinked if the report cannot be found #60347

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
amyevans merged 4 commits into from
Apr 22, 2025
Merged

Leave the #admins room text unlinked if the report cannot be found #60347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4884937
Leave the admins room text unlinked if the report cannot be found
VickyStash Apr 16, 2025
0c3fb6c
Lint fixes
VickyStash Apr 16, 2025
54f071b
Merge branch 'refs/heads/main' into VickyStash/feature/60246-admins-r…
VickyStash Apr 22, 2025
d8ac8d1
Update open admins room logic
VickyStash Apr 22, 2025
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
24 changes: 14 additions & 10 deletions src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useLocalize from '@hooks/useLocalize';
import usePolicy from '@hooks/usePolicy';
import usePreferredCurrency from '@hooks/usePreferredCurrency';
import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
import useThemeIllustrations from '@hooks/useThemeIllustrations';
import useThemeStyles from '@hooks/useThemeStyles';
import {convertToShortDisplayString} from '@libs/CurrencyUtils';
import {getRoom} from '@libs/ReportUtils';
import {isPolicyAdmin} from '@libs/PolicyUtils';
import {getSubscriptionPrice} from '@libs/SubscriptionUtils';
import Navigation from '@navigation/Navigation';
import variables from '@styles/variables';
Expand All @@ -27,9 +28,11 @@ import ROUTES from '@src/ROUTES';
function SubscriptionSettings() {
const {translate} = useLocalize();
const styles = useThemeStyles();
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: false});
const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION, {canBeMissing: false});
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});
const activePolicy = usePolicy(activePolicyID);
const isActivePolicyAdmin = isPolicyAdmin(activePolicy);
const subscriptionPlan = useSubscriptionPlan();
const preferredCurrency = usePreferredCurrency();
const illustrations = useThemeIllustrations();
Expand All @@ -39,13 +42,10 @@ function SubscriptionSettings() {
lower: convertToShortDisplayString(subscriptionPrice, preferredCurrency),
upper: convertToShortDisplayString(subscriptionPrice * CONST.SUBSCRIPTION_PRICE_FACTOR, preferredCurrency),
});
const adminsChatReportID = isActivePolicyAdmin && activePolicy?.chatReportIDAdmins ? activePolicy.chatReportIDAdmins.toString() : undefined;

const openAdminsRoom = () => {
if (!activePolicyID) {
return;
}
const roomReport = getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, activePolicyID);
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(roomReport?.reportID));
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(adminsChatReportID));
};

const subscriptionSizeSection =
Expand Down Expand Up @@ -74,7 +74,11 @@ function SubscriptionSettings() {
{translate('subscription.subscriptionSettings.learnMore.part1')}
<TextLink href={CONST.PRICING}>{translate('subscription.subscriptionSettings.learnMore.pricingPage')}</TextLink>
{translate('subscription.subscriptionSettings.learnMore.part2')}
<TextLink onPress={openAdminsRoom}>{translate('subscription.subscriptionSettings.learnMore.adminsRoom')}</TextLink>
{adminsChatReportID ? (
<TextLink onPress={openAdminsRoom}>{translate('subscription.subscriptionSettings.learnMore.adminsRoom')}</TextLink>
) : (
translate('subscription.subscriptionSettings.learnMore.adminsRoom')
)}
</Text>
<Text style={styles.mutedNormalTextLabel}>{translate('subscription.subscriptionSettings.estimatedPrice')}</Text>
<Text style={styles.mv1}>{priceDetails}</Text>
Expand Down
26 changes: 15 additions & 11 deletions src/pages/settings/Subscription/SubscriptionSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useHasTeam2025Pricing from '@hooks/useHasTeam2025Pricing';
import useLocalize from '@hooks/useLocalize';
import usePolicy from '@hooks/usePolicy';
import usePreferredCurrency from '@hooks/usePreferredCurrency';
import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
import useSubscriptionPossibleCostSavings from '@hooks/useSubscriptionPossibleCostSavings';
import useTheme from '@hooks/useTheme';
import useThemeIllustrations from '@hooks/useThemeIllustrations';
import useThemeStyles from '@hooks/useThemeStyles';
import {convertToShortDisplayString} from '@libs/CurrencyUtils';
import {getRoom} from '@libs/ReportUtils';
import {isPolicyAdmin} from '@libs/PolicyUtils';
import {getSubscriptionPrice} from '@libs/SubscriptionUtils';
import Navigation from '@navigation/Navigation';
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
Expand Down Expand Up @@ -55,9 +56,11 @@ function SubscriptionSettings() {
const {translate} = useLocalize();
const styles = useThemeStyles();
const theme = useTheme();
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: false});
const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION, {canBeMissing: false});
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});
const activePolicy = usePolicy(activePolicyID);
const isActivePolicyAdmin = isPolicyAdmin(activePolicy);
const subscriptionPlan = useSubscriptionPlan();
const hasTeam2025Pricing = useHasTeam2025Pricing();
const preferredCurrency = usePreferredCurrency();
Expand All @@ -66,12 +69,13 @@ function SubscriptionSettings() {
const isActingAsDelegate = !!account?.delegatedAccess?.delegate;
const isAnnual = privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL;
const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
const [privateTaxExempt] = useOnyx(ONYXKEYS.NVP_PRIVATE_TAX_EXEMPT);
const [privateTaxExempt] = useOnyx(ONYXKEYS.NVP_PRIVATE_TAX_EXEMPT, {canBeMissing: true});
const subscriptionPrice = getSubscriptionPrice(subscriptionPlan, preferredCurrency, privateSubscription?.type);
const priceDetails = translate(`subscription.yourPlan.${subscriptionPlan === CONST.POLICY.TYPE.CORPORATE ? 'control' : 'collect'}.${isAnnual ? 'priceAnnual' : 'pricePayPerUse'}`, {
lower: convertToShortDisplayString(subscriptionPrice, preferredCurrency),
upper: convertToShortDisplayString(subscriptionPrice * CONST.SUBSCRIPTION_PRICE_FACTOR, preferredCurrency),
});
const adminsChatReportID = isActivePolicyAdmin && activePolicy?.chatReportIDAdmins ? activePolicy.chatReportIDAdmins.toString() : undefined;

const onOptionSelected = (option: SubscriptionType) => {
if (privateSubscription?.type !== option && isActingAsDelegate) {
Expand Down Expand Up @@ -157,11 +161,7 @@ function SubscriptionSettings() {
);

const openAdminsRoom = () => {
if (!activePolicyID) {
return;
}
const roomReport = getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, activePolicyID);
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(roomReport?.reportID));
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(adminsChatReportID));
};

if (!subscriptionPlan || (hasTeam2025Pricing && subscriptionPlan === CONST.POLICY.TYPE.TEAM)) {
Expand All @@ -183,7 +183,11 @@ function SubscriptionSettings() {
{translate('subscription.subscriptionSettings.learnMore.part1')}
<TextLink href={CONST.PRICING}>{translate('subscription.subscriptionSettings.learnMore.pricingPage')}</TextLink>
{translate('subscription.subscriptionSettings.learnMore.part2')}
<TextLink onPress={openAdminsRoom}>{translate('subscription.subscriptionSettings.learnMore.adminsRoom')}</TextLink>
{adminsChatReportID ? (
<TextLink onPress={openAdminsRoom}>{translate('subscription.subscriptionSettings.learnMore.adminsRoom')}</TextLink>
) : (
translate('subscription.subscriptionSettings.learnMore.adminsRoom')
)}
</Text>
<Text style={styles.mutedNormalTextLabel}>{translate('subscription.subscriptionSettings.estimatedPrice')}</Text>
<Text style={styles.mv1}>{priceDetails}</Text>
Expand Down