rebase

+ i18n dup + fix tests
decred · Feb 7, 2022 · 70c06ae · 70c06ae
1 parent 75c04ed
commit 70c06ae
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/app/components/views/GetStartedPage/LoadingPage/LoadingPage.jsx b/app/components/views/GetStartedPage/LoadingPage/LoadingPage.jsx
@@ -13,7 +13,7 @@ const LoadingPage = ({ onShowOnboardingTutorial }) => {
         className={styles.subtitle}
         title={
           <T
-            id="getstarted.tutorials.learnAboutDecred"
+            id="getstarted.loadingpage.learnAboutDecred"
             m="Learn about decred"
           />
         }

diff --git a/app/components/views/LNPage/ConnectPage/ConnectPage.jsx b/app/components/views/LNPage/ConnectPage/ConnectPage.jsx
@@ -1,9 +1,6 @@
 import { StandalonePage, StandaloneHeader } from "layout";
 import { FormattedMessage as T } from "react-intl";
-import {
-  PiUiPassphraseModalButton,
-  ToggleSwitch
-} from "buttons";
+import { PiUiPassphraseModalButton } from "buttons";
 import { Tooltip } from "pi-ui";
 import {
   LNWALLET_STARTUPSTAGE_STARTDCRLND,

diff --git a/app/components/views/LNPage/ConnectPage/CreationWarning/CreationWarning.jsx b/app/components/views/LNPage/ConnectPage/CreationWarning/CreationWarning.jsx
@@ -24,12 +24,23 @@ const CreationWarning = ({ onAcceptCreationWarning }) => {
   );
 
   return (
-    <>
-      <Documentation name="LNWalletCreationWarning" />
-      <KeyBlueButton onClick={onAcceptCreationWarning}>
+    <div className={styles.container}>
+      <Subtitle
+        className={styles.header}
+        title={<T id="ln.creationWarning.title" m="Before You continue..." />}>
+        <KeyBlueButton
+          onClick={onAcceptCreationWarning}
+          disabled={!isAcceptCreationWarningButtonEnabled}>
+          <T
+            id="ln.createWalletWarning.okBtn"
+            m="I understand and accept the risks"
+          />
+        </KeyBlueButton>
+      </Subtitle>
+      <div className={styles.desc}>
         <T
-          id="ln.createWalletWarning.okBtn"
-          m="I understand and accept the risks"
+          id="ln.creationWarning.desc"
+          m="Please understand that Lightning Network is still work in progress and should be used with caution. In particular:"
         />
       </div>
       <PagedTutorial

diff --git a/app/components/views/SettingsPage/TutorialsTab/helpers/PagedTutorial/PagedTutorial.jsx b/app/components/views/SettingsPage/TutorialsTab/helpers/PagedTutorial/PagedTutorial.jsx
@@ -14,7 +14,7 @@ const PagedTutorial = ({
   activeTabIndex,
   setActiveTabIndex,
   className,
-  tabContentWrapperClassName
+  tabContentWrapperClassName,
   onFinish
 }) => {
   useMountEffect(() => {
@@ -159,7 +159,7 @@ PagedTutorial.propTypes = {
   activeTabIndex: PropTypes.number,
   setActiveTabIndex: PropTypes.func.isRequired,
   className: PropTypes.string,
-  tabContentWrapperClassName: PropTypes.string
+  tabContentWrapperClassName: PropTypes.string,
   onFinish: PropTypes.func
 };
 

diff --git a/app/components/views/SettingsPage/TutorialsTab/helpers/TutorialPage/TutorialPage.jsx b/app/components/views/SettingsPage/TutorialsTab/helpers/TutorialPage/TutorialPage.jsx
@@ -39,7 +39,7 @@ const TutorialPage = ({
           activeTabIndex,
           setActiveTabIndex,
           className: pagedTutorialClassname,
-          tabContentWrapperClassName
+          tabContentWrapperClassName,
           onFinish: goBackHistory
         }}
       />

diff --git a/test/unit/components/views/GetStaredPage/GetStartedPage.spec.js b/test/unit/components/views/GetStaredPage/GetStartedPage.spec.js
@@ -169,10 +169,14 @@ test("click on settings link and go back", async () => {
   await wait(() => screen.getByText(/welcome to decrediton/i));
 
   user.click(screen.getByText(/settings/i));
-  await wait(() => screen.getByText(/connectivity/i));
+  await wait(() => screen.getByText("Connectivity"));
 
   // go back
-  user.click(screen.getByText(/go back/i).nextElementSibling);
+  user.click(
+    screen.getByRole("button", {
+      name: "Go back"
+    })
+  );
   await wait(() => screen.getByText(/welcome to decrediton/i));
 });
 

diff --git a/test/unit/components/views/GetStaredPage/PrivacyPage.spec.js b/test/unit/components/views/GetStaredPage/PrivacyPage.spec.js
@@ -1,4 +1,4 @@
-import PrivacyPage from "components/views/GetStartedPage/PrivacyPage/PrivacyPage";
+import { PrivacyPage } from "components/views/GetStartedPage";
 import { render } from "test-utils.js";
 import { screen } from "@testing-library/react";
 import user from "@testing-library/user-event";