Skip to content

Commit

Permalink
Merge pull request DestinyItemManager#6564 from DestinyItemManager/up…
Browse files Browse the repository at this point in the history
…dates5

Updates5
  • Loading branch information
bhollis committed Mar 6, 2021
2 parents 87030c3 + 57742da commit 937f255
Show file tree
Hide file tree
Showing 4 changed files with 1,072 additions and 998 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@types/react-dom": "^17.0.0",
"@types/react-hammerjs": "^1.0.1",
"@types/react-redux": "^7.0.3",
"@types/react-router": "^5.1.5",
"@types/react-router": "5.1.11",
"@types/react-router-dom": "^5.1.4",
"@types/react-transition-group": "^4.2.0",
"@types/react-virtualized": "^9.21.1",
Expand All @@ -93,7 +93,7 @@
"browserslist": "^4.0.0",
"clean-webpack-plugin": "^3.0.0",
"content-security-policy-builder": "^2.0.0",
"copy-webpack-plugin": "^7.0.0",
"copy-webpack-plugin": "^8.0.0",
"cross-env": "^7.0.0",
"cross-fetch": "^3.0.6",
"css-loader": "^5.0.0",
Expand Down Expand Up @@ -141,8 +141,8 @@
"source-map-loader": "^2.0.1",
"style-loader": "^2.0.0",
"stylelint": "^13.0.0",
"svgo": "^1.3.2",
"svgo-loader": "^2.2.1",
"svgo": "^2.2.1",
"svgo-loader": "^3.0.0",
"terser-webpack-plugin": "^5.0.2",
"ts-jest": "^26.1.0",
"ts-loader": "^8.0.1",
Expand All @@ -158,7 +158,7 @@
"dependencies": {
"@babel/runtime": "^7.1.2",
"@d2api/d2api-types": "^1.0.2",
"@d2api/date": "^2.0.1",
"@d2api/date": "^3.0.0",
"@destinyitemmanager/dim-api-types": "^1.0.0",
"@fortawesome/fontawesome-free": "^5.12.1",
"@fortawesome/fontawesome-svg-core": "^1.2.27",
Expand Down Expand Up @@ -188,10 +188,10 @@
"papaparse": "^5.0.0",
"react": "^17.0.1",
"react-beautiful-dnd": "^13.0.0",
"react-dnd": "^11.1.3",
"react-dnd-html5-backend": "^11.1.3",
"react-dnd": "^13.1.1",
"react-dnd-html5-backend": "^12.1.1",
"react-dnd-multi-backend": "^6.0.2",
"react-dnd-touch-backend": "^11.1.3",
"react-dnd-touch-backend": "^12.0.0",
"react-dom": "^17.0.1",
"react-dropzone": "^11.0.1",
"react-hammerjs": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/app/inventory/move-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export function moveItemTo(
reportException('moveItem', e);
}
} finally {
transaction.finish();
transaction?.finish();
}

return item;
Expand Down
2 changes: 1 addition & 1 deletion src/app/vendors/Vendors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function Vendors({
vendorGroups = filterVendorGroupsToSearch(vendorGroups, searchQuery, filterItems);
}
if (
currentXur().start === undefined &&
currentXur()?.start === undefined &&
vendorGroups.some((v) => v.def.hash === VENDOR_GROUPS.LIMITED_TIME)
) {
const vgIndex = vendorGroups
Expand Down
Loading

0 comments on commit 937f255

Please sign in to comment.