diff --git a/src/components/AssetSelectModal/AssetRow.tsx b/src/components/AssetSelectModal/AssetRow.tsx
index bc6de53..e4948fe 100644
--- a/src/components/AssetSelectModal/AssetRow.tsx
+++ b/src/components/AssetSelectModal/AssetRow.tsx
@@ -15,7 +15,7 @@ type AssetRowProps = {
 export const AssetRow: FC<AssetRowProps> = memo(({ onClick, ...asset }) => {
   const [imgLoaded, setImgLoaded] = useState(false)
   const { name, icon, symbol, id } = asset
-  const handleOnClick = useCallback(() => {
+  const handleClick = useCallback(() => {
     onClick(asset)
   }, [asset, onClick])
 
@@ -29,7 +29,7 @@ export const AssetRow: FC<AssetRowProps> = memo(({ onClick, ...asset }) => {
     <Button
       width='full'
       variant='ghost'
-      onClick={handleOnClick}
+      onClick={handleClick}
       justifyContent='space-between'
       _focus={focus}
       height='auto'
diff --git a/src/components/AssetSelectModal/AssetSelectModal.tsx b/src/components/AssetSelectModal/AssetSelectModal.tsx
index 8dbcab9..4b0b8b9 100644
--- a/src/components/AssetSelectModal/AssetSelectModal.tsx
+++ b/src/components/AssetSelectModal/AssetSelectModal.tsx
@@ -30,7 +30,7 @@ type AssetSelectModalProps = {
 
 export const AssetSelectModal: React.FC<AssetSelectModalProps> = ({ isOpen, onClose, onClick }) => {
   const [searchQuery, setSearchQuery] = useState('')
-  const assets = Object.values(AssetData)
+  const assets = useMemo(() => Object.values(AssetData), [])
   const [activeChain, setActiveChain] = useState<ChainId | 'All'>('All')
   const [searchTermAssets, setSearchTermAssets] = useState<Asset[]>([])
   const iniitalRef = useRef(null)