Merge remote-tracking branch 'origin/develop' into ruslan/swap-fixes2

packages/yoroi-extension/app/components/wallet/send/DelegationSendForm.js

@@ -12,9 +12,9 @@ import styles from './DelegationSendForm.scss';
 import globalMessages from '../../../i18n/global-messages';
 import WarningBox from '../../widgets/WarningBox';
 import type { $npm$ReactIntl$IntlFormat, } from 'react-intl';
-import isHexadecimal from 'validator/lib/isHexadecimal';
 import LocalizableError from '../../../i18n/LocalizableError';
 import { bech32, } from 'bech32';
+import { isHex } from '@emurgo/yoroi-lib/dist/internals/utils/index';
 
 const messages = defineMessages({
   invalidPoolId: {
@@ -39,7 +39,7 @@ function validateAndSetPool(
     if (id.length !== 56) {
       return false;
     }
-    return isHexadecimal(id);
+    return isHex(id);
   }
   try {
     const payload = Buffer.from(

packages/yoroi-extension/app/stores/stateless/tokenHelpers.js

@@ -5,10 +5,10 @@ import type {
   TokenLookupKey, TokenEntry,
 } from '../../api/common/lib/MultiToken';
 import type { TokenRow, TokenMetadata } from '../../api/ada/lib/storage/database/primitives/tables';
-import { isHexadecimal } from 'validator';
 import AssetFingerprint from '@emurgo/cip14-js';
 import { AssetNameUtils } from '@emurgo/yoroi-lib/dist/internals/utils/assets';
 import type { RemoteTokenInfo } from '../../api/ada/lib/state-fetch/types';
+import { isHex } from '@emurgo/yoroi-lib/dist/internals/utils/index';
 
 export function getTokenName(
   tokenRow: $ReadOnly<{
@@ -27,7 +27,7 @@ export function getTokenName(
 }
 
 function resolveNameProperties(name: ?string): {| name: string, cip67Tag: ?string |} {
-  if (name == null || name.length === 0 || !isHexadecimal(name)) {
+  if (name == null || name.length === 0 || !isHex(name)) {
     return { name: '', cip67Tag: null };
   }
   const { asciiName, hexName, cip67Tag } =

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('');

packages/yoroi-extension/app/utils/validations.js

@@ -1,11 +1,10 @@
 // @flow
 import BigNumber from 'bignumber.js';
-import isInt from 'validator/lib/isInt';
 import { MAX_MEMO_SIZE } from '../config/externalStorageConfig';
 import type { $npm$ReactIntl$IntlFormat, } from 'react-intl';
 import { defineMessages, } from 'react-intl';
 import type { NetworkRow, TokenRow } from '../api/ada/lib/storage/database/primitives/tables';
-import { isCardanoHaskell, getCardanoHaskellBaseConfig } from '../api/ada/lib/storage/database/prepackaged/networks';
+import { getCardanoHaskellBaseConfig, isCardanoHaskell } from '../api/ada/lib/storage/database/prepackaged/networks';
 import { getTokenName } from '../stores/stateless/tokenHelpers';
 import { truncateToken } from './formatters';
 
@@ -50,12 +49,10 @@ export const isValidMemoOptional: string => boolean = (memo) => (
 );
 
 export const isWithinSupply: (string, BigNumber) => boolean = (value, totalSupply) => {
-  const isNumeric = isInt(value, { allow_leading_zeroes: false });
-  if (!isNumeric) return false;
   const numericValue = new BigNumber(value);
-  const minValue = new BigNumber(1);
-  const isValid = numericValue.gte(minValue) && numericValue.lte(totalSupply);
-  return isValid;
+  return numericValue.isFinite()
+    && numericValue.gte(1)
+    && numericValue.lte(totalSupply);
 };
 
 export async function validateAmount(

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

packages/yoroi-extension/package.json

@@ -221,8 +221,7 @@
     "trezor-connect-flow": "Emurgo/trezor-connect-flow#92d6d8c8faef25c0ea1d481aa1ecb4ba77ce539c",
     "ua-parser-js": "0.7.24",
     "unorm": "1.6.0",
-    "util": "0.12.5",
-    "validator": "13.5.2"
+    "util": "0.12.5"
   },
   "engineStrict": true,
   "engine": {

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'),

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'),