Merge branch 'bugfix/merge-conflict' into 'develop'

fix: merge conflict

See merge request witapp/aura-webapp!61

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) });
 };

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];

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: {