update and added

src/components/ReactTable4/BasicTable.js

@@ -9,7 +9,7 @@ import { ColumnSearch } from "./ColumnSearch";
 import { GlobalFilter } from "./GlobalFilter";
 
 import { ToggleColumns } from "./ToggleColumns";
-import { COLUMNS } from "./columns";
+import { COLUMNS } from "./COLUMNS";
 import { Pagination } from "./Pagination";
 import { GoToPage } from "./GoToPage";
 import { Settings } from "./Settings";
@@ -105,13 +105,14 @@ const BasicTable = ({
   );
 
   const { globalFilter, pageIndex, pageSize } = state;
+
   return (
     <>
       {/* toggle columns */}
-      <ToggleColumns
+      {/* <ToggleColumns
         allColumns={allColumns}
         getToggleHideAllColumnsProps={getToggleHideAllColumnsProps}
-      />
+      /> */}
       <div className="flex flex-row items-center justify-between">
         {/* right box */}
         <div className="flex-1">
@@ -125,7 +126,7 @@ const BasicTable = ({
         {/* left box */}
         {activeTab == 0 ? (
           <div
-            className="p-2 flex flex-row items-center justify-end rounded-tl rounded-tr"
+            className="p-2 flex flex-row items-center rounded-tl rounded-tr"
             style={{ backgroundColor: "#F1F6FF" }}
           >
             {/* search box */}
@@ -161,6 +162,7 @@ const BasicTable = ({
           </div>
         ) : null}
       </div>
+      {/* table */}
       {activeTab == 0 ? (
         <>
           <table

src/components/ReactTable4/columns.js

@@ -1,7 +1,5 @@
 import { format } from "date-fns";
 
-import Table from "./BasicTable";
-
 import { OrderStatus } from "./OrderStatus";
 import { OrderLevel } from "./OrderLevel";
 import { Buttons } from "./Buttons";

src/components/ReactTable4/index.js

@@ -127,7 +127,7 @@ export function Tabbar({ tabs, delTab, setActivateTab, activeTab }) {
           {el.id ? (
             <img
               src={cancleIcon}
-              className="w-2 h-2 mr-2"
+              className="w-2 mr-3"
               alt=""
               onClick={(e) => {
                 e.preventDefault();