From c27fa422f5c03fe6dc12cde3fb304aad811843a8 Mon Sep 17 00:00:00 2001 From: rocky-fleek Date: Fri, 28 Oct 2022 12:22:33 -0600 Subject: [PATCH 1/3] Installed controller v 0.24.6 including identity json fix for storage migration --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8865fae7..b7c56e8b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@metamask/post-message-stream": "^4.0.0", "@psychedelic/browser-rpc": "2.1.0", "@psychedelic/dab-js": "1.5.0-beta.1", - "@psychedelic/plug-controller": "0.24.4", + "@psychedelic/plug-controller": "0.24.6", "@psychedelic/plug-inpage-provider": "^2.3.1", "@reduxjs/toolkit": "^1.6.0", "advanced-css-reset": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index 690b597d..6f4d2578 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1787,10 +1787,10 @@ cross-fetch "^3.1.4" crypto-js "^4.1.1" -"@psychedelic/plug-controller@0.24.4": - version "0.24.4" - resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.4/7c71cf00d570b5792fb43513b13cf156f4d05ce6#7c71cf00d570b5792fb43513b13cf156f4d05ce6" - integrity sha512-iYXhvsGgRLExLt9J58QJ2xU2YVFobvB+2HI4WZ5KcbPvzGeDZsMsjUSTnNXiqXVn3wzjtzp0ks+gG2K/DslTdw== +"@psychedelic/plug-controller@0.24.6": + version "0.24.6" + resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.6/ffee2559f647411b209f465b1673fb726cf547c3#ffee2559f647411b209f465b1673fb726cf547c3" + integrity sha512-q1rsMblELr73BWnw/JBDWie6KAz46CoCVi+aBClLgf/AIcCZY4UbDlscrnGTqKe5bmSuLrJ6h0ZmmVZaY5Ob4w== dependencies: "@dfinity/agent" "0.9.3" "@dfinity/candid" "0.9.3" From 40f809019f7f0de980c580eefae819bc81360ba5 Mon Sep 17 00:00:00 2001 From: rocky-fleek Date: Fri, 28 Oct 2022 12:55:20 -0600 Subject: [PATCH 2/3] Bumped version to 0.6.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b7c56e8b..cf9164ca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "plug", - "version": "0.6.1", + "version": "0.6.1.1", "description": "Your plug into the Internet Computer", "private": true, "repository": "https://github.com/Psychedelic/plug", From 0ded4833441bc99a553d49c60f491cce82960950 Mon Sep 17 00:00:00 2001 From: rocky-fleek Date: Fri, 28 Oct 2022 13:26:40 -0600 Subject: [PATCH 3/3] INstalled latest controller and dab-js with dip721 refactor. Fixed selector values --- package.json | 4 ++-- .../Views/AddNFT/components/CustomNFT.jsx | 5 +++-- yarn.lock | 18 +++++++++--------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index cf9164ca..dbe67b9c 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "@material-ui/icons": "^4.11.2", "@metamask/post-message-stream": "^4.0.0", "@psychedelic/browser-rpc": "2.1.0", - "@psychedelic/dab-js": "1.5.0-beta.1", - "@psychedelic/plug-controller": "0.24.6", + "@psychedelic/dab-js": "1.5.0-beta.4", + "@psychedelic/plug-controller": "0.24.7", "@psychedelic/plug-inpage-provider": "^2.3.1", "@reduxjs/toolkit": "^1.6.0", "advanced-css-reset": "^1.2.2", diff --git a/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx index 47b55f35..57e524f4 100644 --- a/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx +++ b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx @@ -11,18 +11,19 @@ import { Dialog, Select, } from '@components'; +import { standards } from '@psychedelic/dab-js'; import { validateCanisterId } from '@shared/utils/ids'; import { HANDLER_TYPES, sendMessage } from '@background/Keyring'; import extension from 'extensionizer'; import { customTokensUrl } from '@shared/constants/urls'; import useStyles from '../styles'; -const FUNGIBLE_STANDARDS = { DIP721v2: 'DIP721v2', }; +const FUNGIBLE_STANDARDS = { DIP721: standards.NFT.dip721, }; const CustomNFT = ({ handleChangeSelectedNFT }) => { const { t } = useTranslation(); const [canisterId, setCanisterId] = useState(''); - const [standard, setStandard] = useState(FUNGIBLE_STANDARDS.DIP721v2); + const [standard, setStandard] = useState(FUNGIBLE_STANDARDS.DIP721); const [invalidToken, setInvalidToken] = useState(null); const [tokenError, setTokenError] = useState(''); const [loading, setLoading] = useState(false); diff --git a/yarn.lock b/yarn.lock index 6f4d2578..4956ce90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1773,10 +1773,10 @@ axios "^0.24.0" cross-fetch "^3.1.4" -"@psychedelic/dab-js@1.5.0-beta.1": - version "1.5.0-beta.1" - resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.5.0-beta.1/306e2bb10491927995a3a22f25cd2ca9fd40990e#306e2bb10491927995a3a22f25cd2ca9fd40990e" - integrity sha512-p7GEh++Fv8U1SIYdqjxLLNy3I8fjoEF+lrXsHHKxcFuKpINxWkfWmUxLnjS6rytY+VuovrDEISFD4Tz0QHD2DQ== +"@psychedelic/dab-js@1.5.0-beta.4": + version "1.5.0-beta.4" + resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.5.0-beta.4/efd377970c28a917a93e933a96cbf0013d3c5a61#efd377970c28a917a93e933a96cbf0013d3c5a61" + integrity sha512-A5AKfXUyu7OLJwyv9hT7dVp6zZ01F/QKnLCu4yc7/KpbxQ8V7CvVYp6Jap5Ig06tGYz/XJu2HDLMUxrrIogWxg== dependencies: "@dfinity/agent" "0.9.3" "@dfinity/candid" "0.9.3" @@ -1787,17 +1787,17 @@ cross-fetch "^3.1.4" crypto-js "^4.1.1" -"@psychedelic/plug-controller@0.24.6": - version "0.24.6" - resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.6/ffee2559f647411b209f465b1673fb726cf547c3#ffee2559f647411b209f465b1673fb726cf547c3" - integrity sha512-q1rsMblELr73BWnw/JBDWie6KAz46CoCVi+aBClLgf/AIcCZY4UbDlscrnGTqKe5bmSuLrJ6h0ZmmVZaY5Ob4w== +"@psychedelic/plug-controller@0.24.7": + version "0.24.7" + resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.7/425f18572dbee242d684c10ee27bb8d4123e2e2b#425f18572dbee242d684c10ee27bb8d4123e2e2b" + integrity sha512-1cTI2wUXWo/U1KB62HB8DVje+wEVZDb6CeiNRJ7pfKd7knJvDhVbKCt4ui3TdRo9z+zp46dOrEaBNeRoDQIXqA== 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.7" - "@psychedelic/dab-js" "1.5.0-beta.1" + "@psychedelic/dab-js" "1.5.0-beta.4" "@types/secp256k1" "^4.0.3" axios "^0.21.1" babel-jest "^25.5.1"