Regression: "Enable unlimited apps" button on installation modal doesn't do anything

apps/meteor/client/views/marketplace/UnlimitedAppsUpsellModal.tsx

@@ -1,17 +1,32 @@
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import React from 'react';
+import { useSetting, useTranslation, useRoute } from '@rocket.chat/ui-contexts';
+import React, { useCallback } from 'react';
 
 import UpsellModal from '../../components/UpsellModal';
 
-const UnlimitedAppsUpsellModal = () => {
+export type UnlimitedAppsUpsellModalProps = {
+	onClose: () => void;
+};
+
+const UnlimitedAppsUpsellModal = ({ onClose }: UnlimitedAppsUpsellModalProps) => {
 	const t = useTranslation();
 	const cloudWorkspaceHadTrial = useSetting('Cloud_Workspace_Had_Trial') as boolean;
 	const urls = {
-		goFullyFeaturedRegistered: 'admin/upgrade/go-fully-featured-registered',
-		talkToSales: 'go.rocket.chat/i/contact-sales',
+		goFullyFeaturedRegistered: '/upgrade/go-fully-featured-registered',
+		talkToSales: 'https://go.rocket.chat/i/contact-sales',
 	};
 
+	const adminRoute = useRoute('admin-index');
+
+	const goFullyFeaturedRegistered = useCallback(() => {
+		adminRoute.push({ context: urls.goFullyFeaturedRegistered });
+		onClose();
+	}, [adminRoute, onClose, urls.goFullyFeaturedRegistered]);
+
+	const goToTalkSales = useCallback(() => {
+		window.open(urls.talkToSales, '_blank');
+		onClose();
+	}, [onClose, urls.talkToSales]);
+
 	return (
 		<UpsellModal
 			title={t('Enable_unlimited_apps')}
@@ -20,15 +35,9 @@ const UnlimitedAppsUpsellModal = () => {
 			description={!cloudWorkspaceHadTrial ? t('Workspaces_on_community_edition_trial_on') : t('Workspaces_on_community_edition_trial_off')}
 			confirmText={!cloudWorkspaceHadTrial ? t('Start_free_trial') : t('Learn_more')}
 			cancelText={t('Talk_to_sales')}
-			onConfirm={() => {
-				FlowRouter.go(urls.goFullyFeaturedRegistered);
-			}}
-			onCancel={() => {
-				window.open(urls.talkToSales, '_blank');
-			}}
-			onClose={() => {
-				return null;
-			}}
+			onConfirm={goFullyFeaturedRegistered}
+			onCancel={goToTalkSales}
+			onClose={onClose}
 		/>
 	);
 };

apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx

@@ -14,6 +14,7 @@ const MarketplaceHeader = ({ title }: { title: string }): ReactElement | null =>
 	const route = useRoute('marketplace');
 	const setModal = useSetModal();
 	const result = useAppsCountQuery(context);
+	const handleModalClose = useCallback(() => setModal(null), [setModal]);
 
 	const handleUploadButtonClick = useCallback((): void => {
 		route.push({ context, page: 'install' });
@@ -42,7 +43,7 @@ const MarketplaceHeader = ({ title }: { title: string }): ReactElement | null =>
 						{!result.data.hasUnlimitedApps && (
 							<Button
 								onClick={() => {
-									setModal(<UnlimitedAppsUpsellModal />);
+									setModal(<UnlimitedAppsUpsellModal onClose={handleModalClose} />);
 								}}
 							>
 								{t('Enable_unlimited_apps')}