From 322075163e84ac9923d1ef4f39fe2578a7876023 Mon Sep 17 00:00:00 2001 From: Timea <117268143+Tymmmy@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:20:18 +0200 Subject: [PATCH 1/4] fix: Change dev keys to make it more user friendly (#1858) Change dev keys to make it more user friendly --- .../src/components/settings/DeveloperKeys.tsx | 40 +++++++++++-------- packages/wallet/frontend/src/ui/Button.tsx | 3 +- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/packages/wallet/frontend/src/components/settings/DeveloperKeys.tsx b/packages/wallet/frontend/src/components/settings/DeveloperKeys.tsx index 0f179a4f7..fbce1bfb7 100644 --- a/packages/wallet/frontend/src/components/settings/DeveloperKeys.tsx +++ b/packages/wallet/frontend/src/components/settings/DeveloperKeys.tsx @@ -1,5 +1,10 @@ import { Account } from '@/lib/api/account' -import { Disclosure, Transition } from '@headlessui/react' +import { + Disclosure, + DisclosureButton, + DisclosurePanel, + Transition +} from '@headlessui/react' import { Chevron } from '../icons/Chevron' import { walletAddressService } from '@/lib/api/walletAddress' import { cx } from 'class-variance-authority' @@ -68,9 +73,9 @@ type DeveloperKeysProps = { export const DeveloperKeys = ({ accounts }: DeveloperKeysProps) => { return ( -
+
{accounts.map((account, accountIdx) => ( - + {({ open }) => ( <> { const { setRunOnboarding, isDevKeysOnboarding } = useOnboardingContext() return (
- + Account: {name} { if (isDevKeysOnboarding) { @@ -116,7 +121,7 @@ const AccountHeader = ({ name, isOpen, index }: DisclosureGroupHeaderProps) => { }} /> - +
) } @@ -146,7 +151,7 @@ const AccountPanel = ({ walletAddresses, index }: AccountPanelProps) => { leaveFrom="transform max-h-screen" leaveTo="transform max-h-0" > - +
    {walletAddresses.map((walletAddress, walletAddressIdx) => ( { ))}
- + ) } @@ -215,7 +220,7 @@ const KeysGroupHeader = ({ return (
- +
{name} @@ -227,7 +232,7 @@ const KeysGroupHeader = ({ - +
) } @@ -307,7 +312,7 @@ const KeysGroupPanel = ({ } }} > - +

Key ID

@@ -324,6 +329,7 @@ const KeysGroupPanel = ({
- + ) } @@ -401,7 +407,6 @@ const WalletAddressKeyInfo = ({ )} ))} -
+
Welcome -

+

About{' '} Interledger diff --git a/packages/wallet/frontend/src/pages/auth/login.tsx b/packages/wallet/frontend/src/pages/auth/login.tsx index d75826910..65c439ca6 100644 --- a/packages/wallet/frontend/src/pages/auth/login.tsx +++ b/packages/wallet/frontend/src/pages/auth/login.tsx @@ -148,7 +148,7 @@ const LoginPage: NextPageWithLayout = () => {

Login = ({ )} Forgot password -

+

Remembered your credentials?{' '} Login diff --git a/packages/wallet/frontend/src/pages/auth/signup.tsx b/packages/wallet/frontend/src/pages/auth/signup.tsx index 0acdf3c0e..70fa5d356 100644 --- a/packages/wallet/frontend/src/pages/auth/signup.tsx +++ b/packages/wallet/frontend/src/pages/auth/signup.tsx @@ -179,7 +179,7 @@ const SignUpPage: NextPageWithLayout = () => { )} >

)} -

+

Already a customer?{' '} Log in diff --git a/packages/wallet/frontend/src/pages/auth/verify/[token].tsx b/packages/wallet/frontend/src/pages/auth/verify/[token].tsx index 9fba933d8..7ef125f6d 100644 --- a/packages/wallet/frontend/src/pages/auth/verify/[token].tsx +++ b/packages/wallet/frontend/src/pages/auth/verify/[token].tsx @@ -40,14 +40,14 @@ const VerifyEmailPage: NextPageWithLayout = ({ )} Verify email -

+

Have an account? Continue to{' '} Login From d50b62fb0b7b1fbc50fc997360692b3f3c10676c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:50:39 +0200 Subject: [PATCH 4/4] chore(deps): update dependency @vitejs/plugin-react-swc to ^3.7.2 (#1862) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/boutique/frontend/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/boutique/frontend/package.json b/packages/boutique/frontend/package.json index 62d8e06f8..a68bb2731 100644 --- a/packages/boutique/frontend/package.json +++ b/packages/boutique/frontend/package.json @@ -35,7 +35,7 @@ "@tailwindcss/typography": "^0.5.15", "@types/react": "18.3.12", "@types/react-dom": "18.3.1", - "@vitejs/plugin-react-swc": "^3.7.1", + "@vitejs/plugin-react-swc": "^3.7.2", "autoprefixer": "^10.4.20", "postcss": "^8.4.49", "tailwindcss": "^3.4.15", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c5ca92b25..08802247e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -212,8 +212,8 @@ importers: specifier: 18.3.1 version: 18.3.1 '@vitejs/plugin-react-swc': - specifier: ^3.7.1 - version: 3.7.1(@swc/helpers@0.5.5)(vite@5.4.11(@types/node@22.5.5)) + specifier: ^3.7.2 + version: 3.7.2(@swc/helpers@0.5.5)(vite@5.4.11(@types/node@22.5.5)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.4.49) @@ -2614,10 +2614,10 @@ packages: resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==} engines: {node: ^18.18.0 || >=20.0.0} - '@vitejs/plugin-react-swc@3.7.1': - resolution: {integrity: sha512-vgWOY0i1EROUK0Ctg1hwhtC3SdcDjZcdit4Ups4aPkDcB1jYhmo+RMYWY87cmXMhvtD5uf8lV89j2w16vkdSVg==} + '@vitejs/plugin-react-swc@3.7.2': + resolution: {integrity: sha512-y0byko2b2tSVVf5Gpng1eEhX1OvPC7x8yns1Fx8jDzlJp4LS6CMkCPfLw47cjyoMrshQDoQw4qcgjsU9VvlCew==} peerDependencies: - vite: ^4 || ^5 + vite: ^4 || ^5 || ^6 '@whatwg-node/fetch@0.9.21': resolution: {integrity: sha512-Wt0jPb+04JjobK0pAAN7mEHxVHcGA9HoP3OyCsZtyAecNQeADXCZ1MihFwVwjsgaRYuGVmNlsCmLxlG6mor8Gw==} @@ -8963,7 +8963,7 @@ snapshots: '@typescript-eslint/types': 7.18.0 eslint-visitor-keys: 3.4.3 - '@vitejs/plugin-react-swc@3.7.1(@swc/helpers@0.5.5)(vite@5.4.11(@types/node@22.5.5))': + '@vitejs/plugin-react-swc@3.7.2(@swc/helpers@0.5.5)(vite@5.4.11(@types/node@22.5.5))': dependencies: '@swc/core': 1.7.26(@swc/helpers@0.5.5) vite: 5.4.11(@types/node@22.5.5)