Skip to content

Commit

Permalink
Merge branch 'master' into feat/metamask-auto-login
Browse files Browse the repository at this point in the history
  • Loading branch information
tomicvladan authored Dec 21, 2023
2 parents a4ffe77 + c3732aa commit 478299c
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 20 deletions.
48 changes: 30 additions & 18 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@fairdatasociety/blossom": "^0.5.0",
"@fairdatasociety/fdp-storage": "^0.16.0",
"@fairdatasociety/fdp-storage": "^0.17.0",
"@headlessui/react": "^1.7.14",
"@metamask/sdk": "^0.5.6",
"@types/react-blockies": "^1.4.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Forms/LoginForm/LoginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const LoginForm: FC = () => {
setLoginType('username');
setUser(user_name);
setDefaultNetwork(String(network.id));
router.push('/overview');
router.push('/drive');
} catch (error) {
setErrorMessage(error.message);
} finally {
Expand Down
6 changes: 6 additions & 0 deletions src/data/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ export const networks: Network[] = [
chainId: 421613,
config: getEnsEnvironmentConfig(Environments.ARBITRUM_GOERLI),
},
{
name: 'zkEVM Testnet',
id: Environments.ZKEVM_TESTNET,
chainId: 1442,
config: getEnsEnvironmentConfig(Environments.ZKEVM_TESTNET),
},
];

if (process.env.NEXT_PUBLIC_ENVIRONMENT !== 'PRODUCTION') {
Expand Down

0 comments on commit 478299c

Please sign in to comment.