Mauricio Araujo před 2 roky
rodič
revize
6aa627965b

+ 33 - 30
dashboard/src/main/home/modals/BillingModal.tsx

@@ -6,8 +6,8 @@ import Link from "components/porter/Link";
 import Modal from "components/porter/Modal";
 import Spacer from "components/porter/Spacer";
 import Text from "components/porter/Text";
-import { usePublishableKey } from "lib/hooks/useStripe";
 import { useIntercom } from "lib/hooks/useIntercom";
+import { usePublishableKey } from "lib/hooks/useStripe";
 
 import { Context } from "shared/Context";
 
@@ -76,23 +76,28 @@ const BillingModal = ({
           </Text>
         ) : (
           <Text color="helper">
-            {trialExpired
-              ? (
-                <div>
-                  Your applications will continue to run but you will not be able to access your project until you link a payment method.
-                  {" "}
-                  <Text style={{ cursor: "pointer" }} onClick={() => showIntercomWithMessage({
-                    message: "I have already redeemed my startup deal.",
-                    delaySeconds: 0,
-                  })}>
-                    Already redeemed your startup deal?
-                  </Text>
-                  <Spacer y={0.5} />
-                  {"For more details on the current costs and usage of this project, visit the "}
-                  <Link to="/project-settings?selected_tab=billing">billing page.</Link>
-                </div>
-              )
-              : "Link a payment method to your Porter project."}
+            {trialExpired ? (
+              <div>
+                Your applications will continue to run but you will not be able
+                to access your project until you link a payment method.{" "}
+                <Text
+                  style={{ cursor: "pointer" }}
+                  onClick={() =>
+                    showIntercomWithMessage({
+                      message: "I have already redeemed my startup deal.",
+                      delaySeconds: 0,
+                    })
+                  }
+                >
+                  Already redeemed your startup deal?
+                </Text>
+                {/* <Spacer y={0.5} /> */}
+                {/* {"For more details on the current costs and usage of this project, visit the "}
+                  <Link to="/project-settings?selected_tab=billing">billing page.</Link> */}
+              </div>
+            ) : (
+              "Link a payment method to your Porter project."
+            )}
             <Spacer y={0.5} />
             {`You can learn more about our pricing under "For Businesses" `}
             <Link target="_blank" to="https://porter.run/pricing">
@@ -101,19 +106,17 @@ const BillingModal = ({
           </Text>
         )}
         <Spacer y={1} />
-        {
-          publishableKey ? (
-            <Elements
-              stripe={stripePromise || null}
-              options={options}
-              appearance={appearance}
-            >
-              <PaymentSetupForm onCreate={onCreate}></PaymentSetupForm>
-            </Elements>
-          ) : null
-        }
+        {publishableKey ? (
+          <Elements
+            stripe={stripePromise || null}
+            options={options}
+            appearance={appearance}
+          >
+            <PaymentSetupForm onCreate={onCreate}></PaymentSetupForm>
+          </Elements>
+        ) : null}
       </div>
-    </Modal >
+    </Modal>
   );
 };
 

+ 9 - 9
dashboard/src/main/home/project-settings/ProjectSettings.tsx

@@ -96,15 +96,15 @@ function ProjectSettings(props: any) {
         });
       }
 
-      if (
-        currentProject?.billing_enabled &&
-        currentProject?.metronome_enabled
-      ) {
-        tabOpts.push({
-          value: "usage",
-          label: "Usage",
-        });
-      }
+      // if (
+      //   currentProject?.billing_enabled &&
+      //   currentProject?.metronome_enabled
+      // ) {
+      //   tabOpts.push({
+      //     value: "usage",
+      //     label: "Usage",
+      //   });
+      // }
 
       tabOpts.push({
         value: "additional-settings",