From 49127581207512ad573d4cd6e8991a1d759d6e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=AA=20H=C3=A0n=20Minh=20Khang?= <khanghugo123@gmail.com>
Date: Tue, 24 May 2022 08:38:13 -0400
Subject: [PATCH] Fix issue #57 (#58)

* fix issue #57

* fix further

* fix to phone page
---
 src/components/forms/PhoneNumberForm.js       | 8 ++++----
 src/components/pages/internal/CarriersList.js | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/forms/PhoneNumberForm.js b/src/components/forms/PhoneNumberForm.js
index eedaeb3..912f550 100644
--- a/src/components/forms/PhoneNumberForm.js
+++ b/src/components/forms/PhoneNumberForm.js
@@ -63,7 +63,7 @@ const PhoneNumberForm = props => {
         const sipTrunksPromise = axios({
           method: 'get',
           baseURL: APP_API_BASE_URL,
-          url: '/VoipCarriers',
+          url: `ServiceProviders/${currentServiceProvider}/VoipCarriers`,
           headers: {
             Authorization: `Bearer ${localStorage.getItem('token')}`,
           },
@@ -71,7 +71,7 @@ const PhoneNumberForm = props => {
         const accountsPromise = axios({
           method: 'get',
           baseURL: APP_API_BASE_URL,
-          url: '/Accounts',
+          url: `ServiceProviders/${currentServiceProvider}/Accounts`,
           headers: {
             Authorization: `Bearer ${localStorage.getItem('token')}`,
           },
@@ -79,7 +79,7 @@ const PhoneNumberForm = props => {
         const applicationsPromise = axios({
           method: 'get',
           baseURL: APP_API_BASE_URL,
-          url: '/Applications',
+          url: `ServiceProviders/${currentServiceProvider}/Applications`,
           headers: {
             Authorization: `Bearer ${localStorage.getItem('token')}`,
           },
@@ -87,7 +87,7 @@ const PhoneNumberForm = props => {
         const phoneNumbersPromise = axios({
           method: 'get',
           baseURL: APP_API_BASE_URL,
-          url: '/PhoneNumbers',
+          url: `ServiceProviders/${currentServiceProvider}/PhoneNumbers`,
           headers: {
             Authorization: `Bearer ${localStorage.getItem('token')}`,
           },
diff --git a/src/components/pages/internal/CarriersList.js b/src/components/pages/internal/CarriersList.js
index 61c8423..50a67a5 100644
--- a/src/components/pages/internal/CarriersList.js
+++ b/src/components/pages/internal/CarriersList.js
@@ -104,7 +104,6 @@ const CarriersList = () => {
         return;
       }
       if(!currentServiceProvider) return [];
-      if (!accountList.length) return [];
       // Get all SIP trunks
       const trunkResults = await axios({
         method: 'get',