feat: fix grant message fix when it is NOT withdraw (#1406)

* Fix grant message fix when it is NOT withdraw

* Fix wallet frontend

* Fix wallet grant test

* fix format

* fix fetch grant types

* Change back separation of one click payment, and add universal message for ACCESS to account

* Update use-setup-one-click-mutation.ts

---------

Co-authored-by: Tymmmy <[email protected]>

Author: domin191013

packages/boutique/backend/src/order/controller.ts

@@ -154,9 +154,8 @@ export class OrderController implements IOrderController {
 
       const redirectUrl = await this.openPayments.setupOneClick(
         walletAddressUrl,
-        amount
+        Number(amount)
       )
-
       res.status(200).json(toSuccessResponse({ redirectUrl }))
     } catch (err) {
       next(err)

packages/boutique/frontend/src/hooks/use-setup-one-click-mutation.ts

@@ -7,7 +7,7 @@ import { oneClickSetupSchema } from '@boutique/shared'
 
 interface SetupOneClickMutationParams {
   walletAddressUrl: string
-  amount: number
+  amount: number | string
 }
 
 interface SetupOneClickMutationResponse {

packages/boutique/shared/src/validation.ts

@@ -34,5 +34,9 @@ export const setupFinishSchema = finishOrderSchema.extend({
 
 export const oneClickSetupSchema = z.object({
   walletAddressUrl: walletAddressUrlSchema,
-  amount: z.number()
+  amount: z
+    .union([z.string(), z.number()])
+    .refine((value) => !isNaN(Number(value)), {
+      message: 'Must be a valid number'
+    })
 })

packages/wallet/backend/src/app.ts

@@ -277,7 +277,7 @@ export class App {
     router.get('/grants/:id', isAuth, grantController.getById)
     router.delete('/grants/:id', isAuth, grantController.revoke)
     router.get(
-      '/grant-interactions/:interactionId/:nonce',
+      '/grant-interactions/:interactionId/:nonce/',
       isAuth,
       grantController.getByInteraction
     )

packages/wallet/backend/src/user/service.ts

@@ -156,7 +156,7 @@ export class UserService implements IUserService {
       const boutiqueWallet = await this.walletAddressService.create({
         accountId: boutiqueInfo.defaultAccount.id,
         walletAddressName: 'boutique',
-        publicName: 'Default Payment Pointer',
+        publicName: 'Rafiki Boutique',
         userId: boutiqueInfo.createdUser.id,
         isWM: false
       })

packages/wallet/frontend/src/lib/api/grants.ts

@@ -121,7 +121,7 @@ const createGrantsService = (): GrantsService => ({
             ...(cookies ? { Cookie: cookies } : {})
           }
         })
-        .json<GetGrantResult>()
+        .json<GetGrantResponse>()
       return response
     } catch (error) {
       return getError(error, 'Unable to fetch grant request details.')

packages/wallet/frontend/src/pages/grant-interactions/index.tsx

@@ -58,10 +58,21 @@ const GrantInteractionPage = ({
           width={500}
           height={150}
         />
-        <div className="mt-20 text-xl text-green">
-          <span className="font-semibold">{client}</span> wants to access your
-          wallet account and withdraw{' '}
-          {access?.limits?.debitAmount?.formattedAmount}.
+        <div className="mt-20 text-base">
+          <div>
+            <span className="font-semibold">{client}</span> is requesting access
+            to make a payment on your behalf.
+          </div>
+          <div>
+            Wallet Address client:{' '}
+            <span className="font-semibold">{grant.client}</span>
+          </div>
+          <div>
+            Total amount to debit:{' '}
+            <span className="font-semibold">
+              {access?.limits?.debitAmount?.formattedAmount}
+            </span>
+          </div>
         </div>
         <div className="mx-auto mt-10 flex w-full max-w-xl justify-evenly">
           <Button
@@ -97,8 +108,8 @@ const GrantInteractionPage = ({
         />
         <div className="mt-20 text-xl text-green">
           The request from <span className="font-semibold">{client}</span> to
-          access your wallet account and withdraw{' '}
-          {access?.limits?.debitAmount?.formattedAmount} was previously
+          make a payment on your behalf for the amount of
+          {access?.limits?.debitAmount?.formattedAmount}, was previously
           processed.
         </div>
         <div className="mx-auto mt-10 flex w-full max-w-xl justify-evenly">

packages/wallet/frontend/src/pages/settings/index.tsx

@@ -21,8 +21,6 @@ const AccountSettingsPage: NextPageWithLayout<AccountSettingsProps> = ({
       <SettingsTabs />
       <div className="flex w-full flex-col md:max-w-lg">
         <PersonalSettingsForm user={user} />
-        {/* <Divider />
-        <ChangePasswordForm /> */}
       </div>
       <SmallBubbles className="mt-10 block w-full md:hidden" />
       <Image