Merge pull request #1583 from getAlby/task-align-lnurlauth

feat: use resultcard in lnurlauth
getAlby · Oct 13, 2022 · 8a8c548 · 8a8c548
2 parents a356bfa + 8bbb371
commit 8a8c548
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/app/screens/LNURLAuth/index.tsx b/src/app/screens/LNURLAuth/index.tsx
@@ -1,8 +1,9 @@
+import Button from "@components/Button";
 import ConfirmOrCancel from "@components/ConfirmOrCancel";
 import Container from "@components/Container";
 import ContentMessage from "@components/ContentMessage";
 import PublisherCard from "@components/PublisherCard";
-import SuccessMessage from "@components/SuccessMessage";
+import ResultCard from "@components/ResultCard";
 import { useState } from "react";
 import type { MouseEvent } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,6 +21,7 @@ function LNURLAuth() {
   const { t: tComponents } = useTranslation("components", {
     keyPrefix: "confirm_or_cancel",
   });
+  const { t: tCommon } = useTranslation("common");
 
   const navigate = useNavigate();
   const navState = useNavigationState();
@@ -51,7 +53,9 @@ function LNURLAuth() {
       }
 
       if (response.success) {
-        setSuccessMessage(t("success"));
+        setSuccessMessage(
+          t("success", { name: origin ? origin.name : details.domain })
+        );
         // ATTENTION: if this LNURL is called through `webln.lnurl` then we immediately return and return the response. This closes the window which means the user will NOT see the above successAction.
         // We assume this is OK when it is called through webln.
         if (navState.isPrompt) {
@@ -130,18 +134,14 @@ function LNURLAuth() {
           </Container>
         </>
       ) : (
-        <Container maxWidth="sm">
-          {origin ? (
-            <PublisherCard
-              title={origin.name}
-              image={origin.icon}
-              url={details.domain}
-            />
-          ) : (
-            <PublisherCard title={details.domain} />
-          )}
+        <Container justifyBetween maxWidth="sm">
+          <ResultCard isSuccess message={successMessage} />
           <div className="my-4">
-            <SuccessMessage message={successMessage} onClose={close} />
+            <Button
+              onClick={close}
+              label={tCommon("actions.close")}
+              fullWidth
+            />
           </div>
         </Container>
       )}

diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
@@ -476,7 +476,7 @@
         "heading": "Do you want to login to"
       },
       "submit": "Login",
-      "success": "Authenticated successfully",
+      "success": "Login successful on {{name}}",
       "errors": {
         "status": "Error: Auth status is not ok"
       }