diff --git a/package-lock.json b/package-lock.json index 73874493..ac8f4b35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", "@fairdatasociety/blossom": "^0.5.0", - "@fairdatasociety/fdp-storage": "^0.13.0", + "@fairdatasociety/fdp-storage": "^0.17.0", "@headlessui/react": "^1.7.14", "@metamask/sdk": "^0.5.6", "@types/react-blockies": "^1.4.1", @@ -3072,29 +3072,34 @@ } }, "node_modules/@fairdatasociety/fdp-contracts-js": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.8.0.tgz", - "integrity": "sha512-Lfr/kxCBZ4IYWwAkeRa2fSi9suYd5DxTG5xunfuwMm32FeB99fL7tI19sb5tjPyRj6bphJPaRWmFCdPJ+yfZsg==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.10.0.tgz", + "integrity": "sha512-kaHu9UZBs2s58PQZ6o2SUn4vtswLBPLkIdFt8WH+6uHO8WA73gOGK5Ue9/WIN1tYu/bcgQpNNiO5xhQn99mW5g==", "peerDependencies": { "ethers": ">=5.6.4" } }, "node_modules/@fairdatasociety/fdp-storage": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.13.0.tgz", - "integrity": "sha512-7AWAC/enq1SQCisMuD3wT5cKSOxe8KdC5f3nolWcruCUpdWcwe65YtjDeL88m/E/kcituQGAl2IgWGkqoysB/g==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.17.0.tgz", + "integrity": "sha512-ki1YtdGdTB4widXDn+aUeqiLRmtXBcHFw5VyF/Lljugw91xgRb3gWDG9nn5UFWfju1Wm/2CY7btS/EixaBFHNA==", "dependencies": { "@ethersphere/bee-js": "^6.2.0", - "@fairdatasociety/fdp-contracts-js": "^3.8.0", - "crypto-js": "^4.1.1", + "@fairdatasociety/fdp-contracts-js": "^3.10.0", + "crypto-js": "^4.2.0", "ethers": "^5.5.2", - "js-sha3": "^0.8.0" + "js-sha3": "^0.9.2" }, "engines": { "node": ">=16.0.0", - "npm": ">=8.0.0" + "npm": ">=9.0.0" } }, + "node_modules/@fairdatasociety/fdp-storage/node_modules/js-sha3": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.9.3.tgz", + "integrity": "sha512-BcJPCQeLg6WjEx3FE591wVAevlli8lxsxm9/FzV4HXkV49TmBH38Yvrpce6fjbADGMKFrBMGTqrVz3qPIZ88Gg==" + }, "node_modules/@formatjs/intl-unified-numberformat": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.7.tgz", @@ -9819,8 +9824,9 @@ } }, "node_modules/crypto-js": { - "version": "4.1.1", - "license": "MIT" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" }, "node_modules/crypto-random-string": { "version": "2.0.0", @@ -25002,21 +25008,28 @@ } }, "@fairdatasociety/fdp-contracts-js": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.8.0.tgz", - "integrity": "sha512-Lfr/kxCBZ4IYWwAkeRa2fSi9suYd5DxTG5xunfuwMm32FeB99fL7tI19sb5tjPyRj6bphJPaRWmFCdPJ+yfZsg==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-contracts-js/-/fdp-contracts-js-3.10.0.tgz", + "integrity": "sha512-kaHu9UZBs2s58PQZ6o2SUn4vtswLBPLkIdFt8WH+6uHO8WA73gOGK5Ue9/WIN1tYu/bcgQpNNiO5xhQn99mW5g==", "requires": {} }, "@fairdatasociety/fdp-storage": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.13.0.tgz", - "integrity": "sha512-7AWAC/enq1SQCisMuD3wT5cKSOxe8KdC5f3nolWcruCUpdWcwe65YtjDeL88m/E/kcituQGAl2IgWGkqoysB/g==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@fairdatasociety/fdp-storage/-/fdp-storage-0.17.0.tgz", + "integrity": "sha512-ki1YtdGdTB4widXDn+aUeqiLRmtXBcHFw5VyF/Lljugw91xgRb3gWDG9nn5UFWfju1Wm/2CY7btS/EixaBFHNA==", "requires": { "@ethersphere/bee-js": "^6.2.0", - "@fairdatasociety/fdp-contracts-js": "^3.8.0", - "crypto-js": "^4.1.1", + "@fairdatasociety/fdp-contracts-js": "^3.10.0", + "crypto-js": "^4.2.0", "ethers": "^5.5.2", - "js-sha3": "^0.8.0" + "js-sha3": "^0.9.2" + }, + "dependencies": { + "js-sha3": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.9.3.tgz", + "integrity": "sha512-BcJPCQeLg6WjEx3FE591wVAevlli8lxsxm9/FzV4HXkV49TmBH38Yvrpce6fjbADGMKFrBMGTqrVz3qPIZ88Gg==" + } } }, "@formatjs/intl-unified-numberformat": { @@ -29926,7 +29939,9 @@ } }, "crypto-js": { - "version": "4.1.1" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" }, "crypto-random-string": { "version": "2.0.0" diff --git a/package.json b/package.json index f1cd9020..c0c26099 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", "@fairdatasociety/blossom": "^0.5.0", - "@fairdatasociety/fdp-storage": "^0.13.0", + "@fairdatasociety/fdp-storage": "^0.17.0", "@headlessui/react": "^1.7.14", "@metamask/sdk": "^0.5.6", "@types/react-blockies": "^1.4.1", diff --git a/src/components/Connect/Metamask/MetamaskConnect.tsx b/src/components/Connect/Metamask/MetamaskConnect.tsx index 9917e233..6a1c4ccf 100644 --- a/src/components/Connect/Metamask/MetamaskConnect.tsx +++ b/src/components/Connect/Metamask/MetamaskConnect.tsx @@ -74,7 +74,7 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => { setAddress(wallet.address); setMnemonic(mnemonic); - router.push('/overview'); + router.push('/drive'); } catch (error) { console.error(error); setErrorMessage(String(error.message || error)); diff --git a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx index 444301d1..5baf0125 100644 --- a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx +++ b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx @@ -97,7 +97,7 @@ export default function MetamaskCreateAccount({ await fdpClientRef.current.account.register(request); setWallet(fdpClientRef.current.account.wallet); - setFdpStorageType('native'); + setFdpStorageType('native', undefined, false); setIsLoggedIn(true); setLoginType('username'); setUser(username); diff --git a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx index 997c187d..b0791063 100644 --- a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx +++ b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx @@ -55,7 +55,9 @@ const MetamaskMigrationDialog = ({ if (clickOutside) { return; } - setMetamaskMigrationNotification('closed'); + setMetamaskMigrationNotification( + step === Step.COMPLETE ? 'completed' : 'closed' + ); onClose(); }; diff --git a/src/components/Footers/MainFooter/MainFooter.tsx b/src/components/Footers/MainFooter/MainFooter.tsx index cf1f91ce..ed9d04be 100644 --- a/src/components/Footers/MainFooter/MainFooter.tsx +++ b/src/components/Footers/MainFooter/MainFooter.tsx @@ -27,7 +27,7 @@ const MainFooter: FC = () => { const { intl } = useLocales(); return ( -