feat: adding suggest and approve endpoint for the map (#3937)

apps/admin-panel/app/account/[uuid]/page.tsx

@@ -1,6 +1,6 @@
-import BusinessMapUpdate from "../../../components/account/business-map-update"
 import Details from "../../../components/account/details"
 import AccountUpdate from "../../../components/account/update"
+import { Merchants } from "../../../components/merchants/details"
 import {
   AccountDetailsByAccountIdDocument,
   AccountDetailsByAccountIdQuery,
@@ -19,8 +19,6 @@ export default async function AccountDetails({ params }: { params: { uuid: strin
 
   const auditedAccount = data?.accountDetailsByAccountId
 
-  console.log({ auditedAccount }, "data")
-
   return (
     auditedAccount && (
       <>
@@ -31,9 +29,9 @@ export default async function AccountDetails({ params }: { params: { uuid: strin
           <Details auditedAccount={auditedAccount} />
           <div className="grid grid-cols-1 gap-4">
             <AccountUpdate auditedAccount={auditedAccount} />
-            <BusinessMapUpdate auditedAccount={auditedAccount} />
           </div>
         </div>
+        <Merchants merchants={auditedAccount.merchants} />
       </>
     )
   )

apps/admin-panel/app/account/layout.tsx

@@ -1,16 +1,15 @@
 "use client"
 
 import Image from "next/image"
-/* eslint @typescript-eslint/ban-ts-comment: "off" */
-// @ts-ignore-next-line no-implicit-any error
-import { experimental_useFormState as useFormState } from "react-dom"
+
+import { useFormState } from "react-dom"
 
 import SearchIcon from "../../components/icons/search.svg"
 
 import { accountSearch } from "./search-action"
 
 const initialState = {
-  message: null,
+  message: "",
 }
 
 export default function Account({ children }: { children: React.ReactNode }) {

apps/admin-panel/app/merchants/page.tsx

@@ -0,0 +1,27 @@
+import { Merchants } from "../../components/merchants/details"
+import {
+  MerchantsPendingApprovalDocument,
+  MerchantsPendingApprovalQuery,
+  MerchantsPendingApprovalQueryVariables,
+} from "../../generated"
+import { getClient } from "../graphql-rsc"
+
+export default async function MerchantScreen() {
+  const query = await getClient().query<
+    MerchantsPendingApprovalQuery,
+    MerchantsPendingApprovalQueryVariables
+  >({
+    query: MerchantsPendingApprovalDocument,
+  })
+
+  const merchants = query?.data.merchantsPendingApproval ?? []
+
+  return (
+    <>
+      <h1 className="mx-6 mt-6 text-2xl font-semibold text-gray-700">
+        {"Merchants pending validation"}
+      </h1>
+      <Merchants merchants={merchants} />
+    </>
+  )
+}

apps/admin-panel/app/transactions/layout.tsx

@@ -1,19 +1,15 @@
 "use client"
 
 import Image from "next/image"
-/* eslint @typescript-eslint/ban-ts-comment: "off" */
-// @ts-ignore-next-line no-implicit-any error
-import { experimental_useFormState as useFormState } from "react-dom"
 
-import SearchIcon from "../../components/icons/search.svg"
+import { useFormState } from "react-dom"
 
-/* eslint @typescript-eslint/ban-ts-comment: "off" */
-// @ts-ignore-next-line no-implicit-any error
+import SearchIcon from "../../components/icons/search.svg"
 
 import { transactionSearch } from "./search-action"
 
 const initialState = {
-  message: null,
+  message: "",
 }
 
 export default function Account({ children }: { children: React.ReactNode }) {

apps/admin-panel/app/types.ts

@@ -0,0 +1,3 @@
+import { AuditedAccount } from "../generated"
+
+export type AuditedAccountMainValues = Omit<AuditedAccount, "wallets">

apps/admin-panel/codegen.yml

@@ -1,6 +1,6 @@
 overwrite: true
 schema:
-  - "https://raw.githubusercontent.com/GaloyMoney/galoy/main/core/api/src/graphql/admin/schema.graphql"
+  - "../../core/api/src/graphql/admin/schema.graphql"
 documents:
   - "graphql.gql"
 generates:

apps/admin-panel/components/account/details.tsx

@@ -1,8 +1,8 @@
-import { AuditedAccount } from "../../generated"
+import { AuditedAccountMainValues } from "../../app/types"
 import { formatDate } from "../../app/utils"
 
 const Details: React.FC<{
-  auditedAccount: AuditedAccount
+  auditedAccount: AuditedAccountMainValues
 }> = ({ auditedAccount }) => {
   return (
     <div className="shadow p-6 min-w-0 rounded-lg shadow-xs overflow-hidden bg-white grid grid-cols-2 gap-4">
@@ -26,33 +26,6 @@ const Details: React.FC<{
         <p className="mb-4 font-semibold text-gray-600">Username</p>
         <p className={`text-gray-600`}>{auditedAccount.username || "--"}</p>
       </div>
-      <div>
-        <p className="mb-4 font-semibold text-gray-600">Title</p>
-        <p className={`text-gray-600`}>{auditedAccount.title || "--"}</p>
-      </div>
-      <div>
-        <p className="mb-4 font-semibold text-gray-600">Coordinates</p>
-        <p className={`text-gray-600`}>
-          {auditedAccount.coordinates ? (
-            <a
-              target="_blank"
-              rel="noreferrer"
-              className="underline"
-              href={`https://maps.google.com/?q=${
-                auditedAccount.coordinates?.latitude +
-                "," +
-                auditedAccount.coordinates?.longitude
-              }`}
-            >
-              {auditedAccount.coordinates?.latitude +
-                ", " +
-                auditedAccount.coordinates?.longitude}
-            </a>
-          ) : (
-            "--"
-          )}
-        </p>
-      </div>
       <div className="col-span-2">
         <p className="mb-4 font-semibold text-gray-600">Created At</p>
         <p className={`text-gray-600`}>{formatDate(auditedAccount.createdAt)}</p>

apps/admin-panel/components/account/update.tsx

@@ -13,13 +13,13 @@ import {
   AccountUpdateStatusDocument,
   AccountUpdateStatusMutation,
   AccountUpdateStatusMutationVariables,
-  AuditedAccount,
 } from "../../generated"
 
-import ConfirmForm from "./confirm"
+import ConfirmForm from "../confirm"
+import { AuditedAccountMainValues } from "../../app/types"
 
 type PropType = {
-  auditedAccount: AuditedAccount
+  auditedAccount: AuditedAccountMainValues
 }
 
 const updateLevel = async (formData: FormData) => {