From 89f3a266350c8a0d943d9e162c9f57351bcce686 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 22 Oct 2021 12:59:45 -0700 Subject: [PATCH 1/2] Revert "Disable stripe promise." This reverts commit 3ece5e0ba265f4a7773da71cd4b21c5c0b2b4f8a. --- .../pages/manage/manage.page.component.jsx | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx index 9ca45fd18..986d5a72d 100644 --- a/client/src/pages/manage/manage.page.component.jsx +++ b/client/src/pages/manage/manage.page.component.jsx @@ -166,18 +166,16 @@ const Dms = lazy(() => import("../dms/dms.container")); const { Content, Footer } = Layout; const stripePromise = new Promise((resolve, reject) => { - resolve(null); - // reject(); - // client.query({ query: QUERY_STRIPE_ID }).then((resp) => { - // if (resp.data.bodyshops[0]) - // resolve( - // loadStripe(process.env.REACT_APP_STRIPE_PUBLIC_KEY, { - // stripeAccount: - // resp.data.bodyshops[0].stripe_acct_id || "No Stripe Id Resolve", - // }) - // ); - // reject(); - // }); + client.query({ query: QUERY_STRIPE_ID }).then((resp) => { + if (resp.data.bodyshops[0]) + resolve( + loadStripe(process.env.REACT_APP_STRIPE_PUBLIC_KEY, { + stripeAccount: + resp.data.bodyshops[0].stripe_acct_id || "No Stripe Id Resolve", + }) + ); + reject(); + }); }); const mapStateToProps = createStructuredSelector({ From b1a3f1a7b80835bb50d6e2c21a116e2af3631c50 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 22 Oct 2021 13:01:26 -0700 Subject: [PATCH 2/2] Finish revert stripe removal. --- client/src/pages/manage/manage.page.component.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx index 986d5a72d..b74c14261 100644 --- a/client/src/pages/manage/manage.page.component.jsx +++ b/client/src/pages/manage/manage.page.component.jsx @@ -1,16 +1,16 @@ import { Elements } from "@stripe/react-stripe-js"; -//import { loadStripe } from "@stripe/stripe-js"; +import { loadStripe } from "@stripe/stripe-js"; import { BackTop, Layout } from "antd"; import preval from "preval.macro"; import React, { lazy, Suspense, useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; +import ErrorBoundary from "../../components/error-boundary/error-boundary.component"; import { Link, Route, Switch } from "react-router-dom"; import { createStructuredSelector } from "reselect"; import BreadCrumbs from "../../components/breadcrumbs/breadcrumbs.component"; import ChatAffixContainer from "../../components/chat-affix/chat-affix.container"; import ConflictComponent from "../../components/conflict/conflict.component"; -import ErrorBoundary from "../../components/error-boundary/error-boundary.component"; import FcmNotification from "../../components/fcm-notification/fcm-notification.component"; //import FooterComponent from "../../components/footer/footer.component"; //Component Imports @@ -20,12 +20,12 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container"; import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component"; import TestComponent from "../../components/_test/test.component"; -//import { QUERY_STRIPE_ID } from "../../graphql/bodyshop.queries"; +import { QUERY_STRIPE_ID } from "../../graphql/bodyshop.queries"; import { selectBodyshop, selectInstanceConflict, } from "../../redux/user/user.selectors"; -//import client from "../../utils/GraphQLClient"; +import client from "../../utils/GraphQLClient"; import "./manage.page.styles.scss"; const ManageRootPage = lazy(() =>