Skip to content

Commit

Permalink
Merge pull request #336 from Psychedelic/controller-0.13.3
Browse files Browse the repository at this point in the history
Installed controller 0.13.3
  • Loading branch information
tomiir authored Jan 6, 2022
2 parents 50d0d7b + 76a5029 commit 7732f15
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion source/Popup/Views/Home/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
4 changes: 2 additions & 2 deletions source/Popup/Views/SendNFT/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions source/components/Tokens/styles.js
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
24 changes: 19 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1638,17 +1638,31 @@
cross-fetch "^3.1.4"
crypto-js "^4.1.1"

"@psychedelic/[email protected]":
version "0.13.2"
resolved "https://npm.pkg.github.com/download/@psychedelic/plug-controller/0.13.2/22dfe6bfa4b9b1515d6cf8af4345e600c33f203b4be4757833c00cb444eea194#969bef24bee5491f4ed16897d034b131c7cc012e"
integrity sha512-m6ive137eBQRjYMvlI1IwKQO2hUKBxXcfUlTkYlZmBANJLSfSgC9LK8TSCplfehIsIS3hPITNarKwxq0xPcr/g==
"@psychedelic/[email protected]":
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/[email protected]":
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"
Expand Down

0 comments on commit 7732f15

Please sign in to comment.