From 8eb10ace4c592512c5997f5efaf034add62c60ae Mon Sep 17 00:00:00 2001 From: rocky-fleek Date: Thu, 6 Jan 2022 14:33:44 +0100 Subject: [PATCH 1/2] Installed controller 0.13.3 --- package.json | 2 +- yarn.lock | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5b64cbb4..87e906da 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@material-ui/core": "^4.11.3", "@material-ui/icons": "^4.11.2", "@psychedelic/dab-js": "0.4.3", - "@psychedelic/plug-controller": "0.13.2", + "@psychedelic/plug-controller": "0.13.3", "@psychedelic/plug-inpage-provider": "1.6.1", "@reduxjs/toolkit": "^1.6.0", "advanced-css-reset": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index 35efa6c6..8dd8d4ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1638,17 +1638,31 @@ cross-fetch "^3.1.4" crypto-js "^4.1.1" -"@psychedelic/plug-controller@0.13.2": - version "0.13.2" - resolved "https://npm.pkg.github.com/download/@psychedelic/plug-controller/0.13.2/22dfe6bfa4b9b1515d6cf8af4345e600c33f203b4be4757833c00cb444eea194#969bef24bee5491f4ed16897d034b131c7cc012e" - integrity sha512-m6ive137eBQRjYMvlI1IwKQO2hUKBxXcfUlTkYlZmBANJLSfSgC9LK8TSCplfehIsIS3hPITNarKwxq0xPcr/g== +"@psychedelic/dab-js@0.4.4": + version "0.4.4" + resolved "https://npm.pkg.github.com/download/@psychedelic/dab-js/0.4.4/0890aebc8addca695aa8cb268c5b45cba1aaa104dfccd4ac9a456ef00425443c#de7abcc607e316905adfe2ec7a84efa4258b6371" + integrity sha512-FDtyozw5XOM/HiVbQqBnulxStglvVnb2r51xw7zPV4jA6q8ofqcDGYq81Xwa1yinxVJcYwSpN/lyUo442zdOsw== + dependencies: + "@dfinity/agent" "0.9.3" + "@dfinity/candid" "0.9.3" + "@dfinity/identity" "0.9.3" + "@dfinity/principal" "0.9.3" + axios "^0.24.0" + buffer-crc32 "^0.2.13" + cross-fetch "^3.1.4" + crypto-js "^4.1.1" + +"@psychedelic/plug-controller@0.13.3": + version "0.13.3" + resolved "https://npm.pkg.github.com/download/@psychedelic/plug-controller/0.13.3/0bdf069618f0af2d79e074595f6fb4568433215f063a24801d9bc37a7e88a02a#ac7879203052f0380ab484ef2bd8be391a1b8995" + integrity sha512-kEwA/0OxH340DbxiM1c82DPauSaUtpgmSpQNElfZ9xQGfrdzh0AIZxYziHDhuiiiHc9cBw0jnJJSQkuoXUY+Ow== dependencies: "@dfinity/agent" "0.9.3" "@dfinity/candid" "0.9.3" "@dfinity/identity" "0.9.3" "@dfinity/principal" "0.9.3" "@psychedelic/cap-js" "0.0.5" - "@psychedelic/dab-js" "0.4.3" + "@psychedelic/dab-js" "0.4.4" "@types/secp256k1" "^4.0.3" axios "^0.21.1" babel-jest "^25.5.1" From 76a5029b363e34d6f41f39ffb87ae68de2f97ee6 Mon Sep 17 00:00:00 2001 From: rocky-fleek Date: Thu, 6 Jan 2022 14:40:18 +0100 Subject: [PATCH 2/2] Fix linter issues --- source/Popup/Views/Home/index.jsx | 2 +- source/Popup/Views/SendNFT/index.jsx | 4 ++-- source/components/Tokens/styles.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/Popup/Views/Home/index.jsx b/source/Popup/Views/Home/index.jsx index 2990dca8..54ada616 100644 --- a/source/Popup/Views/Home/index.jsx +++ b/source/Popup/Views/Home/index.jsx @@ -21,7 +21,7 @@ const Home = () => { const dispatch = useDispatch(); const { navigator, tabIndex } = useRouter(); const { - principalId, assetsLoading, collectionsLoading, transactionsLoading, + assetsLoading, collectionsLoading, transactionsLoading, } = useSelector((state) => state.wallet); const onChangeTab = (index) => { diff --git a/source/Popup/Views/SendNFT/index.jsx b/source/Popup/Views/SendNFT/index.jsx index 648ed13c..6f7e4a8a 100644 --- a/source/Popup/Views/SendNFT/index.jsx +++ b/source/Popup/Views/SendNFT/index.jsx @@ -47,8 +47,8 @@ const SendNFT = () => { setErrorMessage(error); } else { const sameNFT = (token) => token.id === nft?.id; - const filteredCollections = collections.filter((collection) => - !collection.tokens.some(sameNFT) + const filteredCollections = collections.filter( + (collection) => !collection.tokens.some(sameNFT), ); dispatch(setCollections({ collections: filteredCollections, diff --git a/source/components/Tokens/styles.js b/source/components/Tokens/styles.js index 2451c6d6..0734fd20 100644 --- a/source/components/Tokens/styles.js +++ b/source/components/Tokens/styles.js @@ -1,10 +1,10 @@ import { makeStyles } from '@material-ui/core/styles'; -export default makeStyles((theme) => ({ +export default makeStyles(() => ({ root: { display: 'flex', flexDirection: 'column', - padding: `10px 0`, + padding: '10px 0', height: 320, }, tokenContainer: {