fix: link account not updating alby connection card

getAlby · Jun 19, 2024 · ff5af24 · ff5af24
1 parent 5dbf576
commit ff5af24
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/frontend/src/components/SidebarHint.tsx b/frontend/src/components/SidebarHint.tsx
@@ -82,7 +82,8 @@ function SidebarHint() {
   if (
     albyMe &&
     nodeConnectionInfo &&
-    albyMe?.keysend_pubkey !== nodeConnectionInfo?.pubkey
+    albyMe?.keysend_pubkey !== nodeConnectionInfo?.pubkey &&
+    !location.pathname.startsWith("/apps")
   ) {
     return (
       <SidebarHintCard

diff --git a/frontend/src/components/connections/AlbyConnectionCard.tsx b/frontend/src/components/connections/AlbyConnectionCard.tsx
@@ -92,15 +92,17 @@ function AlbyConnectionCard({ connection }: { connection?: App }) {
               </ExternalLink>
             </div>
           </div>
-          <div>
-            <Link
-              to={`/apps/${connection?.nostrPubkey}`}
-              className="absolute top-0 right-0"
-            >
-              <EditIcon className="w-4 h-4 hidden group-hover:inline text-muted-foreground hover:text-card-foreground" />
-            </Link>
-            {connection && <AppCardConnectionInfo connection={connection} />}
-          </div>
+          {connection && (
+            <div>
+              <Link
+                to={`/apps/${connection.nostrPubkey}`}
+                className="absolute top-0 right-0"
+              >
+                <EditIcon className="w-4 h-4 hidden group-hover:inline text-muted-foreground hover:text-card-foreground" />
+              </Link>
+              <AppCardConnectionInfo connection={connection} />
+            </div>
+          )}
         </div>
       </CardContent>
     </Card>

diff --git a/frontend/src/hooks/useLinkAccount.ts b/frontend/src/hooks/useLinkAccount.ts
@@ -1,6 +1,7 @@
 import { useState } from "react";
 import { toast } from "src/components/ui/use-toast";
 import { useAlbyMe } from "src/hooks/useAlbyMe";
+import { useApps } from "src/hooks/useApps";
 import { useCSRF } from "src/hooks/useCSRF";
 import { useNodeConnectionInfo } from "src/hooks/useNodeConnectionInfo";
 import { request } from "src/utils/request";
@@ -14,6 +15,7 @@ export enum LinkStatus {
 export function useLinkAccount() {
   const { data: csrf } = useCSRF();
   const { data: me, mutate: reloadAlbyMe } = useAlbyMe();
+  const { mutate: reloadApps } = useApps();
   const { data: nodeConnectionInfo } = useNodeConnectionInfo();
   const [loading, setLoading] = useState(false);
 
@@ -43,7 +45,8 @@ export function useLinkAccount() {
           "Content-Type": "application/json",
         },
       });
-      await reloadAlbyMe();
+      // update the link status and get the newly-created Alby Account app
+      await Promise.all([reloadAlbyMe(), reloadApps()]);
       toast({
         title:
           "Your Alby Hub has successfully been linked to your Alby Account",