From 61b5ddb5fc3150271d7a46d27d00eff83e7fb83d Mon Sep 17 00:00:00 2001 From: arobsn <87387688+arobsn@users.noreply.github.com> Date: Tue, 17 Dec 2024 12:26:41 -0300 Subject: [PATCH] remove `@mdi/js` `mdi-vue` --- package.json | 2 - pnpm-lock.yaml | 22 ------- public/icons/dapps/optimizer.svg | 1 + src/boot/commonSetup.ts | 41 ------------ src/components/AssetInfoModal.vue | 6 +- src/components/ImageSandbox.vue | 22 ++++--- src/components/MdiIcon.vue | 3 - src/components/TxBoxDetails.vue | 10 ++- src/components/WalletItem.vue | 8 +-- src/dapps/DappsList.vue | 2 +- src/dapps/dappsManifest.ts | 10 +-- .../WalletOptimizationDApp.vue | 64 +++++++------------ src/views/AssetsView.vue | 8 ++- src/views/ReceiveView.vue | 12 ++-- src/views/add/AddView.vue | 7 +- 15 files changed, 67 insertions(+), 151 deletions(-) create mode 100644 public/icons/dapps/optimizer.svg delete mode 100644 src/components/MdiIcon.vue diff --git a/package.json b/package.json index 9a1a8a36..0778ecf9 100755 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ "@fleet-sdk/serializer": "^0.8.0", "@fleet-sdk/wallet": "^0.8.1", "@ledgerhq/hw-transport-webusb": "^6.29.4", - "@mdi/js": "^7.4.47", "@oruga-ui/oruga-next": "0.6.0", "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", @@ -48,7 +47,6 @@ "ledger-ergo-js": "^0.1.20", "lodash-es": "^4.17.21", "lucide-vue-next": "^0.468.0", - "mdi-vue": "^3.0.13", "pinia": "^2.3.0", "uqr": "^0.1.2", "vue": "^3.5.13", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a4fb8bc9..46614065 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,9 +43,6 @@ importers: '@ledgerhq/hw-transport-webusb': specifier: ^6.29.4 version: 6.29.4 - '@mdi/js': - specifier: ^7.4.47 - version: 7.4.47 '@oruga-ui/oruga-next': specifier: 0.6.0 version: 0.6.0(vue@3.5.13(typescript@5.7.2)) @@ -88,9 +85,6 @@ importers: lucide-vue-next: specifier: ^0.468.0 version: 0.468.0(vue@3.5.13(typescript@5.7.2)) - mdi-vue: - specifier: ^3.0.13 - version: 3.0.13(@mdi/js@7.4.47)(vue@3.5.13(typescript@5.7.2)) pinia: specifier: ^2.3.0 version: 2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)) @@ -633,9 +627,6 @@ packages: '@ledgerhq/logs@6.12.0': resolution: {integrity: sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA==} - '@mdi/js@7.4.47': - resolution: {integrity: sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==} - '@nautilus-js/eip12-types@0.1.11': resolution: {integrity: sha512-2KNUHUe5Gtmgyo9g+wZronQGXUYap57CpER9msV2mveMk7i4Lrn3t7Xth8HE2jviOSlZ970arDvbVmrxyv5Q6g==} @@ -2585,12 +2576,6 @@ packages: mdast-util-to-hast@13.2.0: resolution: {integrity: sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==} - mdi-vue@3.0.13: - resolution: {integrity: sha512-QHfRJZfhTA4FLqxBh4Gzxq+U+V/XQLw9l8lSIwJGMY4L+7oP+5HkAd+rsySIGfcHLEZakN3xcYpcroLZAoh0cw==} - peerDependencies: - '@mdi/js': '*' - vue: '*' - mdn-data@2.0.28: resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==} @@ -4103,8 +4088,6 @@ snapshots: '@ledgerhq/logs@6.12.0': {} - '@mdi/js@7.4.47': {} - '@nautilus-js/eip12-types@0.1.11': {} '@noble/curves@1.7.0': @@ -6255,11 +6238,6 @@ snapshots: unist-util-visit: 5.0.0 vfile: 6.0.3 - mdi-vue@3.0.13(@mdi/js@7.4.47)(vue@3.5.13(typescript@5.7.2)): - dependencies: - '@mdi/js': 7.4.47 - vue: 3.5.13(typescript@5.7.2) - mdn-data@2.0.28: {} mdn-data@2.0.30: {} diff --git a/public/icons/dapps/optimizer.svg b/public/icons/dapps/optimizer.svg new file mode 100644 index 00000000..7c9be12e --- /dev/null +++ b/public/icons/dapps/optimizer.svg @@ -0,0 +1 @@ +consolidate \ No newline at end of file diff --git a/src/boot/commonSetup.ts b/src/boot/commonSetup.ts index 4e9c86ff..caba89ff 100644 --- a/src/boot/commonSetup.ts +++ b/src/boot/commonSetup.ts @@ -1,31 +1,12 @@ -import { - mdiAlertCircleOutline, - mdiBackupRestore, - mdiCheckAll, - mdiCheckCircleOutline, - mdiClose, - mdiConsolidate, - mdiEye, - mdiEyeOff, - mdiFilter, - mdiFilterOff, - mdiIncognito, - mdiShieldCheckOutline, - mdiSwapVerticalVariant, - mdiWalletOutline, - mdiWalletPlus -} from "@mdi/js"; import { Config, Inputitems, Modal, Slider, Switch } from "@oruga-ui/oruga-next"; import dayjs from "dayjs"; import relativeTime from "dayjs/plugin/relativeTime"; -import mdiVue from "mdi-vue/v3"; import { App } from "vue"; import VueFeather from "vue-feather"; import { createPinia } from "pinia"; import AssetIcon from "@/components/AssetIcon.vue"; import ClickToCopy from "@/components/ClickToCopy.vue"; import LoadingIndicator from "@/components/LoadingIndicator.vue"; -import MdiIcon from "@/components/MdiIcon.vue"; import ToolTip from "@/components/ToolTip.vue"; import { vueCleave } from "@/directives/cleave"; @@ -35,26 +16,6 @@ import "@/assets/styles/main.css"; dayjs.extend(relativeTime); -const MDI_SETTINGS = { - icons: { - mdiIncognito, - mdiFilter, - mdiFilterOff, - mdiAlertCircleOutline, - mdiClose, - mdiWalletPlus, - mdiWalletOutline, - mdiBackupRestore, - mdiCheckAll, - mdiEye, - mdiEyeOff, - mdiSwapVerticalVariant, - mdiConsolidate, - mdiCheckCircleOutline, - mdiShieldCheckOutline - } -}; - const ORUGA_SETTINGS = { switch: { checkCheckedClass: "bg-blue-600" @@ -74,12 +35,10 @@ export function setupApp(app: App): App { .use(Slider) .use(Switch) .use(Config, ORUGA_SETTINGS) - .use(mdiVue, MDI_SETTINGS) .directive("cleave", vueCleave) .component("vue-feather", VueFeather) .component("click-to-copy", ClickToCopy) .component("tool-tip", ToolTip) .component("loading-indicator", LoadingIndicator) - .component("mdi-icon", MdiIcon) .component("asset-icon", AssetIcon); } diff --git a/src/components/AssetInfoModal.vue b/src/components/AssetInfoModal.vue index a10ebfec..476560bd 100644 --- a/src/components/AssetInfoModal.vue +++ b/src/components/AssetInfoModal.vue @@ -7,7 +7,7 @@ content-class="max-h-95vh bg-transparent relative overflow-hidden !max-w-100 !w-90vw" >
@@ -67,6 +67,7 @@ import { defineComponent, PropType } from "vue"; import { isEmpty } from "@fleet-sdk/common"; import { BigNumber } from "bignumber.js"; +import { CircleXIcon } from "lucide-vue-next"; import ImageSandbox from "./ImageSandbox.vue"; import { IAssetInfo } from "@/types/database"; import { assetInfoDbService } from "@/database/assetInfoDbService"; @@ -79,7 +80,8 @@ import { useFormat } from "@/composables/useFormat"; export default defineComponent({ name: "AssetInfoModal", components: { - ImageSandbox + ImageSandbox, + CircleXIcon }, props: { tokenId: { type: String, required: false }, diff --git a/src/components/ImageSandbox.vue b/src/components/ImageSandbox.vue index 9fe1b7a2..58924adb 100644 --- a/src/components/ImageSandbox.vue +++ b/src/components/ImageSandbox.vue @@ -3,22 +3,23 @@
- +
diff --git a/src/components/MdiIcon.vue b/src/components/MdiIcon.vue deleted file mode 100644 index 5e7e3cfa..00000000 --- a/src/components/MdiIcon.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/components/TxBoxDetails.vue b/src/components/TxBoxDetails.vue index cef114a7..0f80968c 100644 --- a/src/components/TxBoxDetails.vue +++ b/src/components/TxBoxDetails.vue @@ -36,11 +36,7 @@ v-if="babelSwap && isErg(asset.tokenId) && assets.length > 1" class="text-center py-2" > - +
@@ -81,6 +77,7 @@