adapt rebase

Author: adonesky1

ui/helpers/utils/token-util.js

@@ -6,6 +6,7 @@ import {
 } from '../../../shared/modules/conversion.utils';
 import { getTokenStandardAndDetails } from '../../store/actions';
 import { ERC1155, ERC721 } from '../constants/common';
+import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import * as util from './util';
 import { formatCurrency } from './confirm-tx.util';
 import { getTransactionData } from './transactions.util';
@@ -244,7 +245,7 @@ export async function getAssetDetails(
     const { standard } = tokenDetails;
     if (standard === ERC721 || standard === ERC1155) {
       const existingCollectible = existingCollectibles.find(({ address }) =>
-        util.isEqualCaseInsensitive(tokenAddress, address),
+        isEqualCaseInsensitive(tokenAddress, address),
       );
 
       if (existingCollectible) {

ui/pages/confirm-approve/confirm-approve.js

@@ -33,7 +33,6 @@ import AdvancedGasFeePopover from '../../components/app/advanced-gas-fee-popover
 import EditGasFeePopover from '../../components/app/edit-gas-fee-popover';
 import EditGasPopover from '../../components/app/edit-gas-popover/edit-gas-popover.component';
 import Loading from '../../components/ui/loading-screen';
-import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { ERC20, ERC1155, ERC721 } from '../../helpers/constants/common';
 import { getCustomTxParamsData } from './confirm-approve.util';
 import ConfirmApproveContent from './confirm-approve-content';