feat: add validators utilities to utils package

packages/suite/src/hooks/settings/backends/useBackendsForm.ts

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useActions, useSelector, useTranslation } from '@suite-hooks';
-import { isUrl } from '@suite-utils/validators';
+import { isUrl } from '@trezor/utils';
 import { setBackend as setBackendAction } from '@settings-actions/walletSettingsActions';
 import type { Network } from '@wallet-types';
 import type { BackendType } from '@wallet-reducers/settingsReducer';

packages/suite/src/hooks/wallet/sign-verify/useSignVerifyForm.ts

@@ -3,7 +3,7 @@ import { useForm, useController } from 'react-hook-form';
 import { useTranslation, useSelector, useActions } from '@suite-hooks';
 import * as protocolActions from '@suite-actions/protocolActions';
 import { isHex } from '@wallet-utils/ethUtils';
-import { isASCII } from '@suite-utils/validators';
+import { isAscii } from '@trezor/utils';
 import { isAddressValid } from '@wallet-utils/validation';
 import type { Account } from '@wallet-types';
 import type { AoppState } from '@suite-reducers/protocolReducer';
@@ -114,7 +114,7 @@ export const useSignVerifyForm = (page: 'sign' | 'verify', account?: Account) =>
                     ? translationString('DATA_NOT_VALID_HEX')
                     : undefined,
             ascii: (message: string) =>
-                !formValues.hex && !isASCII(message)
+                !formValues.hex && !isAscii(message)
                     ? translationString('TR_ASCII_ONLY')
                     : undefined,
         },

packages/suite/src/reducers/suite/resizeReducer.ts

@@ -1,15 +1,15 @@
 import produce from 'immer';
 import * as variables from '@trezor/components/lib/config/variables'; // can't import from index cause it would import all UI components
 import { RESIZE } from '@suite-actions/constants';
-import { getNumberFromPxString } from '@trezor/utils';
+import { getNumberFromPixelString } from '@trezor/utils';
 import { Action } from '@suite-types';
 
 const sizes = {
-    UNAVAILABLE: getNumberFromPxString(variables.SCREEN_SIZE.UNAVAILABLE),
-    SMALL: getNumberFromPxString(variables.SCREEN_SIZE.SM),
-    MEDIUM: getNumberFromPxString(variables.SCREEN_SIZE.MD),
-    LARGE: getNumberFromPxString(variables.SCREEN_SIZE.LG),
-    XLARGE: getNumberFromPxString(variables.SCREEN_SIZE.XL),
+    UNAVAILABLE: getNumberFromPixelString(variables.SCREEN_SIZE.UNAVAILABLE),
+    SMALL: getNumberFromPixelString(variables.SCREEN_SIZE.SM),
+    MEDIUM: getNumberFromPixelString(variables.SCREEN_SIZE.MD),
+    LARGE: getNumberFromPixelString(variables.SCREEN_SIZE.LG),
+    XLARGE: getNumberFromPixelString(variables.SCREEN_SIZE.XL),
 };
 
 const getSize = (screenWidth: number | null): State['size'] => {

packages/suite/src/reducers/suite/suiteReducer.ts

@@ -7,7 +7,7 @@ import { Action, TrezorDevice, Lock, SuiteThemeColors } from '@suite-types';
 import type { Locale } from '@suite-config/languages';
 import { isWeb, getWindowWidth } from '@suite-utils/env';
 import { ensureLocale } from '@suite-utils/l10n';
-import { getNumberFromPxString } from '@trezor/utils';
+import { getNumberFromPixelString } from '@trezor/utils';
 
 export interface DebugModeOptions {
     invityAPIUrl?: string;
@@ -79,7 +79,8 @@ const initialState: SuiteState = {
         taprootBannerClosed: false,
         securityStepsHidden: false,
         dashboardGraphHidden: false,
-        dashboardAssetsGridMode: getWindowWidth() < getNumberFromPxString(variables.SCREEN_SIZE.SM),
+        dashboardAssetsGridMode:
+            getWindowWidth() < getNumberFromPixelString(variables.SCREEN_SIZE.SM),
     },
     settings: {
         theme: {

packages/suite/src/utils/wallet/ethUtils.ts

@@ -1,4 +1,5 @@
 import * as EthereumjsUtil from 'ethereumjs-util';
+import { hasUppercaseLetter } from '@trezor/utils';
 import BigNumber from 'bignumber.js';
 
 export const decimalToHex = (dec: number): string => new BigNumber(dec).toString(16);
@@ -24,14 +25,13 @@ export const strip = (str: string): string => {
 };
 
 export const validateAddress = (address: string): string | null => {
-    const hasUpperCase = new RegExp('^(.*[A-Z].*)$');
     if (address.length < 1) {
         return 'Address is not set';
     }
     if (!EthereumjsUtil.isValidAddress(address)) {
         return 'Address is not valid';
     }
-    if (address.match(hasUpperCase) && !EthereumjsUtil.isValidChecksumAddress(address)) {
+    if (hasUppercaseLetter(address) && !EthereumjsUtil.isValidChecksumAddress(address)) {
         return 'Address is not a valid checksum';
     }
     return null;

packages/utils/src/getNumberFromPixelString.ts

@@ -0,0 +1,2 @@
+export const getNumberFromPixelString = (size: string): number =>
+    parseInt(size.replace('px', ''), 10);

packages/utils/src/hasUppercaseLetter.ts

@@ -0,0 +1,3 @@
+const HAS_UPPERCASE_LATER_REGEXP = new RegExp('^(.*[A-Z].*)$');
+
+export const hasUppercaseLetter = (value: string) => HAS_UPPERCASE_LATER_REGEXP.test(value);

packages/utils/src/index.ts

@@ -7,4 +7,7 @@ export * from './getRandomNumberInRange';
 export * from './capitalizeFirstLetter';
 export * from './countBytesInString';
 export * from './truncateMiddle';
-export * from './getNumberFromPxString';
+export * from './getNumberFromPixelString';
+export * from './isUrl';
+export * from './hasUppercaseLetter';
+export * from './isAscii';

packages/utils/src/isAscii.ts

@@ -0,0 +1,4 @@
+export function isAscii(value?: string): boolean {
+    if (!value) return true;
+    return /^[\x00-\x7F]*$/.test(value); // eslint-disable-line no-control-regex
+}

packages/utils/src/isUrl.ts

@@ -0,0 +1,4 @@
+const URL_REGEXP =
+    /^(http|ws)s?:\/\/[a-z0-9]([a-z0-9.-]+)?(:[0-9]{1,5})?((\/)?(([a-z0-9-_])+(\/)?)+)$/i;
+
+export const isUrl = (value: string): boolean => URL_REGEXP.test(value);

packages/utils/tests/getNumberFromPixelString.test.ts

@@ -0,0 +1,6 @@
+import { getNumberFromPixelString } from '../src/getNumberFromPixelString';
+
+it('getNumberFromPixelString', () => {
+    expect(getNumberFromPixelString('1px')).toBe(1);
+    expect(getNumberFromPixelString('1')).toBe(1);
+});

packages/utils/tests/hasUppercaseLetter.test.ts

@@ -0,0 +1,14 @@
+import { hasUppercaseLetter } from '../src/hasUppercaseLetter';
+
+describe('hasUppercaseLetter', () => {
+    it('hasUppercaseLetter', () => {
+        expect(hasUppercaseLetter('0')).toBe(false);
+        expect(hasUppercaseLetter('abc')).toBe(false);
+        expect(hasUppercaseLetter('abcD')).toBe(true);
+        expect(hasUppercaseLetter('Abcd')).toBe(true);
+        expect(hasUppercaseLetter('aBcd')).toBe(true);
+        expect(hasUppercaseLetter('123abc123')).toBe(false);
+        expect(hasUppercaseLetter('0x123abc456')).toBe(false);
+        expect(hasUppercaseLetter('0x123aBc456')).toBe(true);
+    });
+});

packages/utils/tests/isAscii.test.ts

@@ -0,0 +1,18 @@
+import { isAscii } from '../src/isAscii';
+
+describe('isAscii', () => {
+    describe('isAscii', () => {
+        it('should return true for ASCII only string', () => {
+            expect(isAscii('this is only ascii')).toEqual(true);
+        });
+
+        it('should return true when called without parameter', () => {
+            expect(isAscii()).toEqual(true);
+        });
+
+        it('should return false strings with non ASCII chars', () => {
+            expect(isAscii('¥')).toEqual(false);
+            expect(isAscii('železniční přejezd')).toEqual(false);
+        });
+    });
+});