From dbfa5fe05c2a7ba6cf0bdf907b8b940c5d99fbd3 Mon Sep 17 00:00:00 2001
From: Ganzorig Bayarsaikhan <ganzorig.b@nmma.co>
Date: Mon, 10 Aug 2020 11:17:00 +0800
Subject: [PATCH] fix(board): fix load more button works incorrectly

---
 ui/src/modules/boards/components/ArchivedItems.tsx | 3 ++-
 ui/src/modules/boards/containers/ArchivedItems.tsx | 2 +-
 ui/src/modules/boards/styles/rightMenu.ts          | 9 ++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ui/src/modules/boards/components/ArchivedItems.tsx b/ui/src/modules/boards/components/ArchivedItems.tsx
index 0f8111dbf4f..583fc51c566 100644
--- a/ui/src/modules/boards/components/ArchivedItems.tsx
+++ b/ui/src/modules/boards/components/ArchivedItems.tsx
@@ -1,4 +1,5 @@
 import EmptyState from 'modules/common/components/EmptyState';
+import Icon from 'modules/common/components/Icon';
 import { __ } from 'modules/common/utils';
 import { IDeal } from 'modules/deals/types';
 import { ITicket } from 'modules/tickets/types';
@@ -121,7 +122,7 @@ class ArchivedItems extends React.Component<Props, State> {
           />
         ))}
         {hasMore ? (
-          <LoadMore onClick={loadMore}>{__('Load More')}</LoadMore>
+          <LoadMore onClick={loadMore}><Icon icon="redo" />{__('Load More')}</LoadMore>
         ) : null}
       </>
     );
diff --git a/ui/src/modules/boards/containers/ArchivedItems.tsx b/ui/src/modules/boards/containers/ArchivedItems.tsx
index c5458594556..6d251222b15 100644
--- a/ui/src/modules/boards/containers/ArchivedItems.tsx
+++ b/ui/src/modules/boards/containers/ArchivedItems.tsx
@@ -171,7 +171,7 @@ class ArchivedItemsContainer extends React.Component<IFinalProps> {
 
           return {
             ...prev,
-            [itemName]: [...fetchedItems, ...prevItems]
+            [itemName]: [...prevItems, ...fetchedItems]
           };
         }
       });
diff --git a/ui/src/modules/boards/styles/rightMenu.ts b/ui/src/modules/boards/styles/rightMenu.ts
index 3e92744de42..7e3f97fa493 100644
--- a/ui/src/modules/boards/styles/rightMenu.ts
+++ b/ui/src/modules/boards/styles/rightMenu.ts
@@ -110,8 +110,15 @@ const ItemContainer = styled.div`
 
 const LoadMore = styled.span`
   text-decoration: underline;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   color: ${colors.colorCoreGray};
+  display: block;
+  text-align: center;
+
+  > i {
+    margin-right: 5px;
+  }
+
   &:hover {
     cursor: pointer;
     color: ${colors.textSecondary};