diff --git a/frontend/jest.config.js b/frontend/jest.config.js
index cac8328d..27818d64 100644
--- a/frontend/jest.config.js
+++ b/frontend/jest.config.js
@@ -1,16 +1,14 @@
 module.exports = {
   setupFiles: ['./jest.setup.js'],
   transform: {
-    '^.+\\.[tj]sx?$': 'babel-jest', // Using Babel for transforming JS, JSX, TS, and TSX
+    '^.+\\.[tj]sx?$': 'babel-jest',
   },
   moduleNameMapper: {
+    '\\.svg\\?react$': '<rootDir>/test/__mocks__/svgMock.js', // Add this line
     '\\.svg$': '<rootDir>/test/__mocks__/svgMock.js',
     '\\.css$': '<rootDir>/test/__mocks__/styleMock.js',
     '^src/(.*)$': ['<rootDir>/src/$1'],
   },
-  transformIgnorePatterns: [
-    'node_modules/(?!(axios|starknetkit)/)', // Ignore transforming node_modules
-  ],
-
-  testEnvironment: 'jsdom', // Use node as the test environment
+  transformIgnorePatterns: ['node_modules/(?!(axios|starknetkit)/)'],
+  testEnvironment: 'jsdom',
 };
diff --git a/frontend/src/services/wallet.jsx b/frontend/src/services/wallet.jsx
index 2c1f277b..237094ee 100644
--- a/frontend/src/services/wallet.jsx
+++ b/frontend/src/services/wallet.jsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { connect, disconnect } from 'starknetkit';
 import { InjectedConnector } from 'starknetkit/injected';
 import { ETH_ADDRESS, STRK_ADDRESS, USDC_ADDRESS } from '../utils/constants';
-import ETH from '../assets/icons/ethereum.svg';
-import USDC from '../assets/icons/borrow_usdc.svg';
-import STRK from '../assets/icons/strk.svg';
+import ETH from '../assets/icons/ethereum.svg?react';
+import USDC from '../assets/icons/borrow_usdc.svg?react';
+import STRK from '../assets/icons/strk.svg?react';
 
 const CRM_TOKEN_ADDRESS = '0x051c4b1fe3bf6774b87ad0b15ef5d1472759076e42944fff9b9f641ff13e5bbe';
 
diff --git a/frontend/test/__mocks__/svgMock.js b/frontend/test/__mocks__/svgMock.js
index 7e3a2716..52408d22 100644
--- a/frontend/test/__mocks__/svgMock.js
+++ b/frontend/test/__mocks__/svgMock.js
@@ -1,6 +1,11 @@
 import React from 'react';
 
-const SvgMock = React.forwardRef((props, ref) => <span ref={ref} {...props} />);
+const SvgMock = React.forwardRef((props, ref) => (
+  <span ref={ref} {...props} data-testid="svg-mock">
+    SVG Mock
+  </span>
+));
 
-export const ReactComponent = SvgMock;
-export default SvgMock;
+SvgMock.displayName = 'SvgMock';
+
+module.exports = SvgMock;