gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'clone' into 'main'

Browse Source 
Clone

See merge request witapp/aura-webapp!5
This commit is contained in:
Victor Ershov 2023-12-04 20:02:21 +00:00
commit 7d5d53b901
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/App/index.tsx
View File

@ -190,7 +190,9 @@ function App(): JSX.Element {
<Route
path={routes.client.subscription()}
element={<SubscriptionPage />}
/>
>
<Route path=":subPlan" element={<SubscriptionPage />} />
</Route>
</Route>
<Route element={<PrivateOutlet />}>
<Route element={<AuthorizedUserOutlet />}>

18
src/components/SubscriptionPage/index.tsx
View File

@ -1,6 +1,6 @@
import { useDispatch, useSelector } from "react-redux";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import { useNavigate, useParams } from "react-router-dom";
import { actions, selectors } from "@/store";
import MainButton from "../MainButton";
import Policy from "../Policy";
@ -51,14 +51,22 @@ function SubscriptionPage(): JSX.Element {
const [subPlans, setSubPlans] = useState<ISubscriptionPlan[]>([]);
const birthday = useSelector(selectors.selectBirthday);
const queryParameters = new URLSearchParams(window.location.search);
const sub_plan = queryParameters.get("sub_plan") || "";
// const queryParameters = new URLSearchParams(window.location.search);
// const sub_plan = queryParameters.get("sub_plan") || "";
const { subPlan } = useParams();
const activeSubPlanFromStore = useSelector(selectors.selectActiveSubPlan);
let activeSubPlan;
if (sub_plan) {
const targetSubPlan = subPlans.find((subPlan) => subPlan.id === sub_plan);
if (subPlan) {
const targetSubPlan = subPlans.find(
(sub_plan) =>
String(
sub_plan.trial?.price_cents
? Math.floor(sub_plan.trial?.price_cents / 100)
: sub_plan.id.replace(".", "")
) === subPlan
);
if (targetSubPlan) {
activeSubPlan = targetSubPlan;
}