diff --git a/package-lock.json b/package-lock.json index 7e98ed015..6c94a3396 100644 --- a/package-lock.json +++ b/package-lock.json @@ -163,7 +163,7 @@ "rollup-plugin-polyfill-node": "^0.11.0", "start-server-and-test": "^1.11.0", "tsconfig-paths-webpack-plugin": "^3.2.0", - "typescript": "~4.8.4", + "typescript": "^5.0.2", "vite": "^3.2.4", "vite-plugin-html": "^3.2.0", "vite-plugin-pwa": "^0.13.3", @@ -3146,6 +3146,19 @@ "dev": true, "license": "0BSD" }, + "node_modules/@formatjs/cli/node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/@formatjs/cli/node_modules/universalify": { "version": "2.0.0", "dev": true, @@ -3323,6 +3336,19 @@ "dev": true, "license": "0BSD" }, + "node_modules/@formatjs/ts-transformer/node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/@glideapps/glide-data-grid": { "version": "5.0.0", "license": "MIT", @@ -16731,6 +16757,19 @@ "license": "0BSD", "optional": true }, + "node_modules/eslint-plugin-formatjs/node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "optional": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/eslint-plugin-import": { "version": "2.22.1", "license": "MIT", @@ -33999,15 +34038,16 @@ } }, "node_modules/typescript": { - "version": "4.8.4", - "devOptional": true, - "license": "Apache-2.0", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz", + "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==", + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=12.20" } }, "node_modules/ua-parser-js": { @@ -38737,6 +38777,12 @@ "version": "2.3.1", "dev": true }, + "typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true + }, "universalify": { "version": "2.0.0", "dev": true @@ -38878,6 +38924,12 @@ "tslib": { "version": "2.3.1", "dev": true + }, + "typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true } } }, @@ -48403,6 +48455,12 @@ "tslib": { "version": "2.3.1", "optional": true + }, + "typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "optional": true } } }, @@ -59968,8 +60026,10 @@ } }, "typescript": { - "version": "4.8.4", - "devOptional": true + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz", + "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==", + "dev": true }, "ua-parser-js": { "version": "0.7.28", diff --git a/package.json b/package.json index 0ec751409..82654c3e2 100644 --- a/package.json +++ b/package.json @@ -170,7 +170,7 @@ "rollup-plugin-polyfill-node": "^0.11.0", "start-server-and-test": "^1.11.0", "tsconfig-paths-webpack-plugin": "^3.2.0", - "typescript": "~4.8.4", + "typescript": "^5.0.2", "vite": "^3.2.4", "vite-plugin-html": "^3.2.0", "vite-plugin-pwa": "^0.13.3", diff --git a/src/custom-apps/components/WebhookSubscriptionQuery/WebhookSubscriptionQuery.tsx b/src/custom-apps/components/WebhookSubscriptionQuery/WebhookSubscriptionQuery.tsx index 961423f95..ca4d539b9 100644 --- a/src/custom-apps/components/WebhookSubscriptionQuery/WebhookSubscriptionQuery.tsx +++ b/src/custom-apps/components/WebhookSubscriptionQuery/WebhookSubscriptionQuery.tsx @@ -39,6 +39,7 @@ const WebhookSubscriptionQuery: React.FC = ({ const explorerPlugin = useExplorerPlugin({ query, onEdit: setQuery, + showAttribution: false, }); const classes = useStyles(); diff --git a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx index f588f0889..fe28c5633 100644 --- a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx +++ b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx @@ -136,7 +136,7 @@ const OrderRefundAmount: React.FC = props => { const selectedRefundAmount = isRefundAutomatic ? refundTotalAmount?.amount - : data.amount; + : Number(data.amount); const isAmountTooSmall = selectedRefundAmount && selectedRefundAmount <= 0; const isAmountTooBig = selectedRefundAmount > maxRefund?.amount;