From c1aeef14c8358c430ba17785859618bea5df9a2c Mon Sep 17 00:00:00 2001 From: Tymmmy <117268143+Tymmmy@users.noreply.github.com> Date: Fri, 1 Mar 2024 13:04:05 +0200 Subject: [PATCH 1/2] Fix onboarding by downgrading --- packages/wallet/frontend/package.json | 2 +- .../src/components/onboarding/Onboarding.tsx | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/packages/wallet/frontend/package.json b/packages/wallet/frontend/package.json index fc711dcbf..4d7ef0f3c 100644 --- a/packages/wallet/frontend/package.json +++ b/packages/wallet/frontend/package.json @@ -17,7 +17,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-hook-form": "^7.50.1", - "react-joyride": "^2.7.4", + "react-joyride": "^2.5.4", "react-select": "^5.8.0", "sharp": "^0.33.2", "socket.io-client": "^4.7.4", diff --git a/packages/wallet/frontend/src/components/onboarding/Onboarding.tsx b/packages/wallet/frontend/src/components/onboarding/Onboarding.tsx index 6d4aec22f..08484f08d 100644 --- a/packages/wallet/frontend/src/components/onboarding/Onboarding.tsx +++ b/packages/wallet/frontend/src/components/onboarding/Onboarding.tsx @@ -28,7 +28,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: 'body', content: `Welcome to Testnet! Testnet is a Rafiki playground, where you can add multiple accounts and make Interledger transactions with play money. Let's begin our journey.`, disableOverlayClose: true, - disableBeacon: true, placement: 'center', Icon: Wave }, @@ -37,7 +36,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#newAccount', content: `You need an account in order to deposit money and start transacting. Let's create your first account.`, disableOverlayClose: true, - disableBeacon: true, spotlightClicks: true, Icon: Pointer }, @@ -48,7 +46,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ 'All accounts need a name, so please add a name for your EUR account.', placement: 'center', disableOverlayClose: true, - disableBeacon: true, Icon: Person }, { @@ -56,7 +53,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#redirectButtonSuccess', content: `Let's see inside your newly created account.`, disableOverlayClose: true, - disableBeacon: true, spotlightClicks: true, Icon: PersonDoc }, @@ -65,7 +61,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#walletAddress', content: `In order to send and receive money, all accounts need at least a payment pointer, so let's add a payment pointer to your account.`, disableOverlayClose: true, - disableBeacon: true, spotlightClicks: true, Icon: Plus }, @@ -75,7 +70,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ content: 'Your balance is currently $0. In order to make your first transaction, you need to add money to your account.', disableOverlayClose: true, - disableBeacon: true, spotlightClicks: true, Icon: MoneyHand }, @@ -84,7 +78,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#balance', content: 'Congratulations, you have money in your account.', disableOverlayClose: true, - disableBeacon: true, placement: 'center', Icon: PaperPlane }, @@ -95,7 +88,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ 'Now that you have created your account and added a payment pointer, we can start making your first Interledger transaction.', disableOverlayClose: true, spotlightClicks: true, - disableBeacon: true, Icon: MoneyOut }, { @@ -103,7 +95,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#sendReceive', content: `You have to pay some fees in order to send payments. 'receive' means that the receiver will get the exact amount from the input and you will be paying a small fee in addition to that. 'send' means that the fees will be deducted from the amount in the input, and receiver will get the rest.`, disableOverlayClose: true, - disableBeacon: true, Icon: Switch }, { @@ -111,7 +102,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#acceptQuote', content: `You can review your payment details before sending the money. For now, let's continue the transaction.`, disableOverlayClose: true, - disableBeacon: true, spotlightClicks: true, Icon: ThumbsUp }, @@ -120,7 +110,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#redirectButtonSuccess', content: `Congratulations, you have made your first Interledger transaction. Now let's explore your account some more.`, disableOverlayClose: true, - disableBeacon: true, spotlightClicks: true, Icon: Pointer }, @@ -129,7 +118,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#request', content: `You can also request money by creating a payment url, and share it with someone. But for now let's see your previous transaction.`, disableOverlayClose: true, - disableBeacon: true, Icon: MoneyCircle }, { @@ -137,7 +125,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#eurAccount', content: 'Go inside your EUR account.', disableOverlayClose: true, - disableBeacon: true, spotlightClicks: true, Icon: Dollar }, @@ -146,7 +133,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#viewTransactions', content: 'You can view all your incoming and outgoing transactions.', disableOverlayClose: true, - disableBeacon: true, spotlightClicks: true, Icon: TransactionCircle }, @@ -155,7 +141,6 @@ export const ONBOARDING_STEPS: StepWithIcon[] = [ target: '#transactionsList', content: `Here you can see the transaction list for this payment pointer. Now you are familiar with the basics of Testnet. Continue to play around.`, disableOverlayClose: true, - disableBeacon: true, Icon: HomeRooftop } ] From 5747994de272ff9062d30256f656dfa5a53b2f73 Mon Sep 17 00:00:00 2001 From: Tymmmy <117268143+Tymmmy@users.noreply.github.com> Date: Fri, 1 Mar 2024 13:13:34 +0200 Subject: [PATCH 2/2] Update pnpm-lock.yaml --- pnpm-lock.yaml | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c0908eb1e..165c52a8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,7 +101,7 @@ importers: version: 1.14.1 ts-jest: specifier: ^29.1.2 - version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.3) + version: 29.1.2(@babel/core@7.23.0)(jest@29.7.0)(typescript@5.3.3) tsc-alias: specifier: ^1.8.8 version: 1.8.8 @@ -369,7 +369,7 @@ importers: specifier: ^7.50.1 version: 7.50.1(react@18.2.0) react-joyride: - specifier: ^2.7.4 + specifier: ^2.5.4 version: 2.7.4(@types/react@18.2.60)(react-dom@18.2.0)(react@18.2.0) react-select: specifier: ^5.8.0 @@ -10952,6 +10952,40 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + /ts-jest@29.1.2(@babel/core@7.23.0)(jest@29.7.0)(typescript@5.3.3): + resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} + engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.0 <8' + '@jest/types': ^29.0.0 + babel-jest: ^29.0.0 + esbuild: '*' + jest: ^29.0.0 + typescript: '>=4.3 <6' + peerDependenciesMeta: + '@babel/core': + optional: true + '@jest/types': + optional: true + babel-jest: + optional: true + esbuild: + optional: true + dependencies: + '@babel/core': 7.23.0 + bs-logger: 0.2.6 + fast-json-stable-stringify: 2.1.0 + jest: 29.7.0(@types/node@18.18.3) + jest-util: 29.7.0 + json5: 2.2.3 + lodash.memoize: 4.1.2 + make-error: 1.3.6 + semver: 7.5.4 + typescript: 5.3.3 + yargs-parser: 21.1.1 + dev: true + /ts-jest@29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.3): resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0}