From 74aaed65b6bc45c23f57d38381c087aa8c5d19ac Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Mon, 7 Aug 2023 23:06:29 +0200
Subject: [PATCH] Fix styles import order

---
 .../src/short-urls/helpers/ShortUrlsRowMenu.tsx             | 4 ++--
 src/index.scss                                              | 6 +++---
 test/common/services/HttpClient.test.ts                     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu.tsx b/shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu.tsx
index 35273bed..7e4a4cc0 100644
--- a/shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu.tsx
+++ b/shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu.tsx
@@ -26,11 +26,11 @@ export const ShortUrlsRowMenu = (
 
   return (
     <RowDropdownBtn minWidth={190}>
-      <DropdownItem tag={ShortUrlDetailLink} shortUrl={shortUrl} suffix="visits">
+      <DropdownItem tag={ShortUrlDetailLink} shortUrl={shortUrl} suffix="visits" asLink>
         <FontAwesomeIcon icon={pieChartIcon} fixedWidth /> Visit stats
       </DropdownItem>
 
-      <DropdownItem tag={ShortUrlDetailLink} shortUrl={shortUrl} suffix="edit">
+      <DropdownItem tag={ShortUrlDetailLink} shortUrl={shortUrl} suffix="edit" asLink>
         <FontAwesomeIcon icon={editIcon} fixedWidth /> Edit short URL
       </DropdownItem>
 
diff --git a/src/index.scss b/src/index.scss
index 3dfcc1b1..9bac305e 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -1,7 +1,7 @@
-@import '@shlinkio/shlink-frontend-kit/base';
-@import '@shlinkio/shlink-frontend-kit/index';
-@import '@shlinkio/shlink-web-component/index';
+@import '@shlinkio/shlink-frontend-kit/base'; // Before bootstrap stylesheet. Includes SASS var overrides
 @import 'node_modules/bootstrap/scss/bootstrap.scss';
+@import '@shlinkio/shlink-frontend-kit/index'; // After bootstrap. Includes CSS overwrites
+@import '@shlinkio/shlink-web-component/index';
 
 * {
   outline: none !important;
diff --git a/test/common/services/HttpClient.test.ts b/test/common/services/HttpClient.test.ts
index fbab591f..45a38f11 100644
--- a/test/common/services/HttpClient.test.ts
+++ b/test/common/services/HttpClient.test.ts
@@ -61,7 +61,7 @@ describe('HttpClient', () => {
       const theError = { error: true, foo: 'bar' };
       fetch.mockResolvedValue({ json: () => theError, ok: false });
 
-      await expect(httpClient.fetchJson('')).rejects.toEqual(theError);
+      await expect(httpClient.fetchEmpty('')).rejects.toEqual(theError);
     });
   });
 });