Merge branch 'master' into feat/new-onboarding

getAlby · Feb 15, 2024 · 6375947 · 6375947
2 parents 388c7ad + 536b378
commit 6375947
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@bitcoin-design/bitcoin-icons-react": "^0.1.10",
     "@bitcoinerlab/secp256k1": "^1.0.5",
-    "@getalby/sdk": "^3.2.3",
+    "@getalby/sdk": "^3.3.0",
     "@headlessui/react": "^1.7.18",
     "@lightninglabs/lnc-web": "^0.2.4-alpha",
     "@noble/curves": "^1.3.0",

diff --git a/src/app/components/AccountMenu/index.tsx b/src/app/components/AccountMenu/index.tsx
@@ -127,7 +127,7 @@ function AccountMenu({ showOptions = true }: Props) {
               openOptions(`accounts/${authAccount?.id}`);
             }}
           >
-            <WalletIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300" />
+            <WalletIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300 shrink-0" />
             {t("options.account.account_settings")}
           </Menu.ItemButton>
           {(isAlbyLNDHubAccount(
@@ -140,7 +140,7 @@ function AccountMenu({ showOptions = true }: Props) {
                 window.open(`https://getalby.com/user`, "_blank");
               }}
             >
-              <GlobeIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300" />
+              <GlobeIcon className="h-5 w-5 mr-2 text-gray-700 dark:text-neutral-300 shrink-0" />
               {t("options.account.go_to_web_wallet")} →
             </Menu.ItemButton>
           )}

diff --git a/src/app/components/Menu/MenuItemButton.tsx b/src/app/components/Menu/MenuItemButton.tsx
@@ -21,7 +21,7 @@ function MenuItemButton({
           className={classNames(
             active ? "bg-gray-50 dark:bg-surface-02dp" : "",
             disabled ? "cursor-not-allowed" : "cursor-pointer",
-            "flex items-center w-full p-4 text-sm text-gray-800 dark:text-neutral-200"
+            "flex items-center w-full p-4 text-sm text-gray-800 dark:text-neutral-200 whitespace-nowrap"
           )}
           disabled={disabled}
           onClick={onClick}

diff --git a/src/app/components/mnemonic/MnemonicInputs/index.tsx b/src/app/components/mnemonic/MnemonicInputs/index.tsx
@@ -27,6 +27,9 @@ export default function MnemonicInputs({
   while (words.length < 12) {
     words.push("");
   }
+  while (words.length > 12) {
+    words.pop();
+  }
 
   return (
     <div className="border border-gray-200 dark:border-neutral-700 rounded-lg p-6 flex flex-col gap-4 items-center justify-center">

diff --git a/src/app/screens/ConfirmRequestPermission/index.tsx b/src/app/screens/ConfirmRequestPermission/index.tsx
@@ -65,24 +65,23 @@ const ConfirmRequestPermission: FC = () => {
                   </p>
                 )}
               </div>
-
-              <div className="flex items-center mb-2">
-                <Checkbox
-                  id="always_allow"
-                  name="always_allow"
-                  checked={alwaysAllow}
-                  onChange={() => setAlwaysAllow((prev) => !prev)}
-                />
-                <label
-                  htmlFor="always_allow"
-                  className="cursor-pointer pl-2 block text-sm text-gray-900 font-medium dark:text-white"
-                >
-                  {t("always_allow")}
-                </label>
-              </div>
             </div>
           </div>
           <div className="text-center flex flex-col">
+            <div className="flex items-center mb-4">
+              <Checkbox
+                id="always_allow"
+                name="always_allow"
+                checked={alwaysAllow}
+                onChange={() => setAlwaysAllow((prev) => !prev)}
+              />
+              <label
+                htmlFor="always_allow"
+                className="cursor-pointer pl-2 block text-sm text-gray-900 font-medium dark:text-white"
+              >
+                {t("always_allow")}
+              </label>
+            </div>
             <ConfirmOrCancel
               label={tCommon("actions.confirm")}
               onCancel={reject}

diff --git a/src/app/screens/LNURLChannel/index.tsx b/src/app/screens/LNURLChannel/index.tsx
@@ -74,6 +74,7 @@ function LNURLChannel() {
       }
     } catch (e) {
       console.error(e);
+      if (e instanceof Error) toast.error(`Error: ${e.message}`);
     } finally {
       setLoadingConfirm(false);
     }

diff --git a/yarn.lock b/yarn.lock
@@ -673,10 +673,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.52.0.tgz#78fe5f117840f69dc4a353adf9b9cd926353378c"
   integrity sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==
 
-"@getalby/sdk@^3.2.3":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@getalby/sdk/-/sdk-3.2.3.tgz#3031d64e935feea879b969da0a17ee05800fba1d"
-  integrity sha512-8eIqg1vEH2CdkNoHsIlL5q2bKLvLR+XiSWK2RQnTAB+Z0CNlVW2jRM8JxxeubHnKBDTiBrBMkPqBIAhQqc8now==
+"@getalby/sdk@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@getalby/sdk/-/sdk-3.3.0.tgz#176982faecf994bf677944f31ecbb8e0f4032ee1"
+  integrity sha512-Y/RwxIo7iYTsKDaTbDmZME1AuB8v5bw9CmqBN3u6fkI8ibYYi8RgeRW78orwCNKRZFB//ZF4MEpAJBGZ3vNNzQ==
   dependencies:
     events "^3.3.0"
     nostr-tools "^1.17.0"