fix: user queries

grassrootseconomics · Oct 9, 2024 · 5af5359 · 5af5359
1 parent 9ec7219
commit 5af5359
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/src/app/(app)/wallet/profile/profile.tsx b/src/app/(app)/wallet/profile/profile.tsx
@@ -15,7 +15,6 @@ export const Profile = () => {
   const utils = trpc.useUtils();
   const { mutateAsync, isPending } = trpc.me.update.useMutation();
   const auth = useAuth();
-  const { data: me } = trpc.me.get.useQuery();
   const updateUser = (values: UserProfileFormType) => {
     mutateAsync(values)
       .then(() => {
@@ -48,7 +47,7 @@ export const Profile = () => {
               {auth?.user?.given_names ?? "Unknown"}
             </div>
             <div className="text-sm font-semibold text-primary/80">
-              {me?.vpa}
+              {auth?.user?.vpa}
             </div>
           </div>
         </div>
@@ -64,11 +63,11 @@ export const Profile = () => {
           </TabsList>
           <TabsContent value="profile" className="mt-0">
             <div className="p-4">
-              {me && (
+              {auth?.user && (
                 <ProfileForm
                   buttonLabel="Update"
                   isLoading={isPending}
-                  initialValues={me}
+                  initialValues={auth?.user}
                   onSubmit={updateUser}
                 />
               )}

diff --git a/src/components/users/dialogs/gas-request-dialog.tsx b/src/components/users/dialogs/gas-request-dialog.tsx
@@ -1,7 +1,8 @@
 "use client";
 import { useState } from "react";
 import { toast } from "sonner";
-import { Loading } from "~/components/loading";
+import { useAuth } from "~/hooks/useAuth";
+import { trpc } from "~/lib/trpc";
 import { Button } from "../../ui/button";
 import {
   Dialog,
@@ -12,9 +13,8 @@ import {
   DialogTrigger,
 } from "../../ui/dialog";
 import { ProfileForm, type UserProfileFormType } from "../forms/profile-form";
-import { trpc } from "~/lib/trpc";
 const GasRequestDialog = () => {
-  const me = trpc.me.get.useQuery();
+  const auth = useAuth();
   const updateMe = trpc.me.update.useMutation();
   const utils = trpc.useUtils();
   const requestGas = trpc.me.requestGas.useMutation();
@@ -44,17 +44,13 @@ const GasRequestDialog = () => {
             Please update your profile to receive Celo access
           </DialogDescription>
         </DialogHeader>
-        {me.isLoading ? (
-          <Loading />
-        ) : (
-          me.data && (
-            <ProfileForm
-              buttonLabel="Apply and Update Profile"
-              initialValues={me.data}
-              onSubmit={applyAndUpdateProfile}
-              isLoading={updateMe.isPending || requestGas.isPending}
-            />
-          )
+        {auth?.user && (
+          <ProfileForm
+            buttonLabel="Apply and Update Profile"
+            initialValues={auth.user}
+            onSubmit={applyAndUpdateProfile}
+            isLoading={updateMe.isPending || requestGas.isPending}
+          />
         )}
       </DialogContent>
     </Dialog>

diff --git a/src/context/index.tsx b/src/context/index.tsx
@@ -88,7 +88,7 @@ function ContextProvider({
           <trpc.Provider client={trpcClient} queryClient={queryClient}>
             <ReactQueryDevtools initialIsOpen={false} />
             <AuthProvider>
-              <RainbowKitProvider coolMode>{children}</RainbowKitProvider>
+              <RainbowKitProvider>{children}</RainbowKitProvider>
             </AuthProvider>
           </trpc.Provider>
         </QueryClientProvider>