From 2b5ebed85edc50d21559a41b0266a9b6c0e3f79d Mon Sep 17 00:00:00 2001 From: gofnnp Date: Mon, 25 Mar 2024 01:32:46 +0400 Subject: [PATCH] fix: merge conflict --- src/api/resources/SinglePayment.ts | 7 ++----- src/components/pages/PaymentWithEmailPage/index.tsx | 1 - src/routes.ts | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/api/resources/SinglePayment.ts b/src/api/resources/SinglePayment.ts index 93fd625..e7c63cd 100644 --- a/src/api/resources/SinglePayment.ts +++ b/src/api/resources/SinglePayment.ts @@ -5,9 +5,7 @@ interface Payload { token: string; } -export interface PayloadGet extends Payload { - id: string; -} +export type PayloadGet = Payload; export interface PayloadPost extends Payload { data: { @@ -75,8 +73,7 @@ export const createRequestPost = ({ data, token }: PayloadPost): Request => { }); }; -export const createRequestGet = ({ id, token }: PayloadGet): Request => { - id; +export const createRequestGet = ({ token }: PayloadGet): Request => { const url = new URL(routes.server.dApiTestPaymentProducts()); return new Request(url, { method: "GET", headers: getAuthHeaders(token) }); }; diff --git a/src/components/pages/PaymentWithEmailPage/index.tsx b/src/components/pages/PaymentWithEmailPage/index.tsx index 7638b76..53ec033 100644 --- a/src/components/pages/PaymentWithEmailPage/index.tsx +++ b/src/components/pages/PaymentWithEmailPage/index.tsx @@ -117,7 +117,6 @@ function PaymentWithEmailPage() { console.log(token); const productsSinglePayment = await api.getSinglePaymentProducts({ - id: "1", token, }); const { productId } = productsSinglePayment[0]; diff --git a/src/routes.ts b/src/routes.ts index 0b1d34d..1e6f378 100755 --- a/src/routes.ts +++ b/src/routes.ts @@ -7,7 +7,6 @@ export const apiHost = "https://api-web.aura.wit.life"; const dApiHost = isProduction ? "https://d.api.witapps.us" : "https://dev.api.witapps.us" const siteHost = "https://aura.wit.life"; const prefix = "api/v1"; -const dApiHost = "https://dev.api.witapps.us"; const routes = { client: {