Skip to content

Commit

Permalink
Merge branch 'master' into feat/search-collections
Browse files Browse the repository at this point in the history
  • Loading branch information
Melisa Anabella Rossi authored May 3, 2024
2 parents 28957c0 + 462f533 commit e05b35b
Show file tree
Hide file tree
Showing 26 changed files with 225 additions and 137 deletions.
156 changes: 75 additions & 81 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"@dcl/crypto": "^3.4.5",
"@dcl/hashing": "^3.0.4",
"@dcl/mini-rpc": "^1.0.7",
"@dcl/schemas": "^11.5.0",
"@dcl/sdk": "7.4.18",
"@dcl/schemas": "^11.7.0",
"@dcl/sdk": "^7.4.21",
"@dcl/single-sign-on-client": "^0.1.0",
"@dcl/ui-env": "^1.5.0",
"@sentry/react": "^7.64.0",
Expand Down Expand Up @@ -42,7 +42,7 @@
"decentraland-ecs": "6.12.4-7784644013.commit-f770b3e",
"decentraland-experiments": "^1.0.2",
"decentraland-transactions": "^2.6.1",
"decentraland-ui": "^5.17.1",
"decentraland-ui": "^5.21.0",
"ethers": "^5.6.8",
"file-saver": "^2.0.1",
"graphql": "^15.8.0",
Expand Down
2 changes: 2 additions & 0 deletions src/components/ItemDetailPage/ItemDetailPage.container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { openModal } from 'decentraland-dapps/dist/modules/modal/actions'
import { FETCH_ITEMS_REQUEST, DELETE_ITEM_REQUEST, deleteItemRequest, saveItemRequest, SAVE_ITEM_REQUEST } from 'modules/item/actions'
import { MapStateProps, MapDispatchProps, MapDispatch } from './ItemDetailPage.types'
import ItemDetailPage from './ItemDetailPage'
import { getIsWearableUtilityEnabled } from 'modules/features/selectors'

const mapState = (state: RootState): MapStateProps => {
const itemId = getItemId(state)
Expand All @@ -25,6 +26,7 @@ const mapState = (state: RootState): MapStateProps => {
item,
collection,
status,
isWearableUtilityEnabled: getIsWearableUtilityEnabled(state),
isLoading:
isLoadingType(getLoading(state), FETCH_ITEMS_REQUEST) ||
isLoadingType(getLoading(state), DELETE_ITEM_REQUEST) ||
Expand Down
6 changes: 6 additions & 0 deletions src/components/ItemDetailPage/ItemDetailPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
height: 256px;
}

.ItemDetailPage .item-data .attribute-row {
display: flex;
flex-direction: row;
margin-top: 10px;
}

.ItemDetailPage .item-data .subtitle {
color: var(--secondary-text);
font-size: 13px;
Expand Down
Loading

0 comments on commit e05b35b

Please sign in to comment.