Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into WALLET-378-cw-fire…
Browse files Browse the repository at this point in the history
…fox-user-is-not-redirected-to-home-screen-after-leaving-review
  • Loading branch information
Comp0te committed Nov 14, 2024
2 parents e09007d + 2a71fbd commit f51ccc0
Show file tree
Hide file tree
Showing 97 changed files with 881 additions and 1,447 deletions.
2 changes: 1 addition & 1 deletion e2e-tests/popup/buy-cspr/buy-cspr.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ popup.describe('Popup UI: buy cspr', () => {
}
);

popup(
popup.skip(
'should redirect to Ramp provider page',
async ({ popupPage, unlockVault, context }) => {
await unlockVault();
Expand Down
130 changes: 64 additions & 66 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"big.js": "^6.2.1",
"casper-cep18-js-client": "1.0.2",
"casper-js-sdk": "2.15.4",
"casper-wallet-core": "git+ssh://[email protected]:make-software/casper-wallet-core.git#v0.9.5",
"casper-wallet-core": "git+ssh://[email protected]:make-software/casper-wallet-core.git#v0.9.6",
"date-fns": "^2.30.0",
"i18next": "^23.11.0",
"i18next-browser-languagedetector": "^7.2.1",
Expand All @@ -86,7 +86,7 @@
"micro-aes-gcm": "0.3.3",
"qrcode.react": "^3.1.0",
"react": "^18.2.0",
"react-dom": "^18.0.2",
"react-dom": "^18.3.1",
"react-hook-form": "7.48.2",
"react-i18next": "14.1.0",
"react-infinite-scroll-hook": "^4.1.1",
Expand All @@ -110,7 +110,7 @@
"@babel/preset-env": "7.23.2",
"@babel/preset-react": "7.18.6",
"@babel/preset-typescript": "^7.23.3",
"@playwright/test": "^1.39.0",
"@playwright/test": "^1.47.2",
"@redux-devtools/cli": "^4.0.0",
"@redux-devtools/remote": "^0.9.3",
"@testing-library/dom": "9.3.4",
Expand All @@ -126,7 +126,7 @@
"@types/md5": "^2.3.5",
"@types/node": "^20.9.0",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.18",
"@types/react-dom": "^18.3.0",
"@types/react-virtualized": "^9.21.30",
"@types/styled-components": "^5.1.26",
"@typescript-eslint/parser": "^5.62.0",
Expand Down
6 changes: 3 additions & 3 deletions src/apps/connect-to-app/pages/switch-account/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type SwitchAccountContentProps = { requestId: string };
export function SwitchAccountContent({ requestId }: SwitchAccountContentProps) {
const activeOrigin = useSelector(selectActiveOrigin);
const activeAccount = useSelector(selectVaultActiveAccount);
const publicKeys = useSelector(selectVaultAccountsPublicKeys);
const accountsPublicKeys = useSelector(selectVaultAccountsPublicKeys);
const connectedAccountsToActiveTab = useSelector(
selectConnectedAccountsWithActiveOrigin
);
Expand Down Expand Up @@ -77,7 +77,7 @@ export function SwitchAccountContent({ requestId }: SwitchAccountContentProps) {
account => account.name !== activeAccount?.name
);

const accountsInfo = useFetchAccountsInfo(publicKeys);
const accountsInfo = useFetchAccountsInfo(accountsPublicKeys);

return (
<PageContainer>
Expand Down Expand Up @@ -141,7 +141,7 @@ export function SwitchAccountContent({ requestId }: SwitchAccountContentProps) {
<SpaceBetweenContainer>
<LeftAlignedFlexColumn>
<ConnectionStatusBadge
isConnected
isConnected={true}
displayContext="accountList"
/>
<Typography type="body">{account.name}</Typography>
Expand Down
10 changes: 7 additions & 3 deletions src/apps/onboarding/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { QueryClientProvider } from '@tanstack/react-query';
import React, { Suspense, useState } from 'react';
import { createRoot } from 'react-dom/client';
import { Provider as ReduxProvider } from 'react-redux';
Expand All @@ -14,6 +15,7 @@ import { onboardingAppInit } from '@background/redux/windowManagement/actions';

import '@libs/i18n/i18n';
import { ErrorBoundary } from '@libs/layout';
import { newQueryClient } from '@libs/services/query-client';
import { GlobalStyle, lightTheme } from '@libs/ui';

const Tree = () => {
Expand All @@ -37,9 +39,11 @@ const Tree = () => {
<ThemeProvider theme={lightTheme}>
<GlobalStyle />
<ReduxProvider store={store}>
<ErrorBoundary>
<AppRouter />
</ErrorBoundary>
<QueryClientProvider client={newQueryClient}>
<ErrorBoundary>
<AppRouter />
</ErrorBoundary>
</QueryClientProvider>
</ReduxProvider>
</ThemeProvider>
</Suspense>
Expand Down
Loading

0 comments on commit f51ccc0

Please sign in to comment.