chore: refactoring code

Author: Hubert Koster

src/features/Endpoint/Endpoint.tsx

@@ -11,7 +11,7 @@ interface IEndpointFormValues {
 }
 const EndPoint = () => {
   const default_endpoint = {
-    app_id: getAppId(false),
+    app_id: getAppId(),
     server_url: OAUTH_URL,
   };
 

src/features/Endpoint/__tests__/Endpoint.test.tsx

@@ -25,7 +25,7 @@ describe('Endpoint', () => {
     const app_id = screen.getByPlaceholderText('e.g. 9999');
     expect(server).toHaveValue('oauth.deriv.com');
 
-    expect(app_id).toHaveValue('35073');
+    expect(app_id).toHaveValue('35074');
   });
 
   it('validate user inputs, and provides error messages for app id field', async () => {

src/utils/__tests__/utils.test.ts

@@ -34,22 +34,23 @@ describe('Get an object with currency data', () => {
 
 describe('Get App ID', () => {
   it("Should return 35074 when it's called in localhost environment", () => {
-    const appId = getAppId(true);
+    window.location.hostname = 'localhost';
+    const appId = getAppId();
     expect(appId).toBe('35074');
   });
   it("Should return 35073 when it's called in vercel environment", () => {
     window.location.hostname = 'deriv-api-docs.binary.sx';
-    const appId = getAppId(false);
+    const appId = getAppId();
     expect(appId).toBe('35073');
   });
   it("Should return 36545 when it's called in staging environment", () => {
     window.location.hostname = 'staging-api.deriv.com';
-    const appId = getAppId(false);
+    const appId = getAppId();
     expect(appId).toBe('36545');
   });
   it("Should return 36544 when it's called in production environment", () => {
     window.location.hostname = 'api.deriv.com';
-    const appId = getAppId(false);
+    const appId = getAppId();
     expect(appId).toBe('36544');
   });
 });

src/utils/index.ts

@@ -59,10 +59,9 @@ export const isHost = (hostname: string) => {
  * @param isLocalHost {boolean} pass `true` if the project is running on localhost
  * @returns {string} proper appId for the project
  */
-export const getAppId = (isLocalHost: boolean) => {
-  if (isLocalHost) return LOCALHOST_APP_ID;
-
+export const getAppId = () => {
   // if not localhost, then one of the following:
+  if (isHost('localhost')) return LOCALHOST_APP_ID;
   if (isHost('staging-api.deriv.com')) return STAGING_APP_ID;
   if (isHost('deriv-api-docs.binary.sx')) return VERCEL_DEPLOYMENT_APP_ID;
   if (isHost('api.deriv.com')) return PRODUCTION_APP_ID;
@@ -135,7 +134,7 @@ export const getServerConfig = () => {
     const isLocalHost = isHost('localhost');
     return {
       serverUrl: DEFAULT_WS_SERVER,
-      appId: getAppId(isLocalHost),
+      appId: getAppId(),
       oauth: OAUTH_URL,
     };
   }