Merge pull request #3484 from Emurgo/ruslan/warn-fixes

warn fixes
Emurgo · Apr 29, 2024 · 18b844e · 18b844e
2 parents ef377ca + ffd47bb
commit 18b844e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 72 deletions.
diff --git a/packages/yoroi-extension/app/assets/images/revamp/fingerprint-info.inline.svg b/packages/yoroi-extension/app/assets/images/revamp/fingerprint-info.inline.svg
diff --git a/packages/yoroi-extension/app/containers/swap/asset-swap/mockData.js b/packages/yoroi-extension/app/containers/swap/asset-swap/mockData.js
diff --git a/packages/yoroi-extension/app/utils/nftMetadata.js b/packages/yoroi-extension/app/utils/nftMetadata.js
@@ -1,5 +1,4 @@
 //@flow
-import { isArray } from 'util';
 
 import type {
   CardanoAssetMintMetadata,
@@ -41,7 +40,7 @@ export function find721metadata(
   }
   if (
     typeof asset.image === 'string' || (
-      isArray(asset.image) &&  asset.image.every(i => typeof i === 'string')
+      Array.isArray(asset.image) &&  asset.image.every(i => typeof i === 'string')
     )
   ) {
     ret.image = asset.image;
@@ -51,19 +50,19 @@ export function find721metadata(
   }
   if (
     typeof asset.description === 'string' || (
-      isArray(asset.description) && asset.description.every(i => typeof i === 'string')
+      Array.isArray(asset.description) && asset.description.every(i => typeof i === 'string')
     )
   ) {
     ret.description = asset.description;
   }
   if (
-    isArray(asset.files) &&
+    Array.isArray(asset.files) &&
       asset.files.every(({ name, mediaType, src }) => (
         typeof name === 'string' &&
           typeof mediaType === 'string' &&
           (
             typeof src === 'string' ||
-              (isArray(src) && src.every(s => typeof s === 'string'))
+              (Array.isArray(src) && src.every(s => typeof s === 'string'))
           )
       ))
   ) {
@@ -97,7 +96,7 @@ export function getImageFromTokenMetadata(
     return nftMetadata.image;
   }
   if (
-    isArray(nftMetadata.image) &&
+    Array.isArray(nftMetadata.image) &&
       nftMetadata.image.every(s => typeof s === 'string')
   ) {
     return nftMetadata.image.join('');

diff --git a/packages/yoroi-extension/ledger/stores/index.js b/packages/yoroi-extension/ledger/stores/index.js
@@ -9,7 +9,9 @@ import { SUPPORTED_LOCALS } from '../i18n/translations';
 import type { URLParams } from '../types/cmn';
 import type { TransportIdType } from '../types/enum';
 import { TRANSPORT_ID } from '../types/enum';
-import { version as appVersion } from '../../package.json';
+import packageInfo from '../../package.json';
+
+const appVersion = packageInfo.version;
 
 /**
  * This is the RootStore, RootStore is responsible for creating all store

diff --git a/packages/yoroi-extension/webpack-mv2/commonConfig.js b/packages/yoroi-extension/webpack-mv2/commonConfig.js
@@ -219,6 +219,7 @@ const optimization = {
 const resolve = () /*: * */ => ({
   extensions: ['*', '.js', '.wasm'],
   fallback: {
+    vm: false,
     fs: false,
     path: require.resolve('path-browserify'),
     stream: require.resolve('stream-browserify'),

diff --git a/packages/yoroi-extension/webpack/commonConfig.js b/packages/yoroi-extension/webpack/commonConfig.js
@@ -193,6 +193,7 @@ const optimization = {
 const resolve = () /*: * */ => ({
   extensions: ['*', '.js', '.wasm'],
   fallback: {
+    vm: false,
     fs: false,
     path: require.resolve('path-browserify'),
     stream: require.resolve('stream-browserify'),