From 21bee9d477109ff336920c1a34bbad90cfb98e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=20Jurmanovi=C4=87?= <fjurma12@outlook.com>
Date: Sat, 19 Jun 2021 23:04:43 +0200
Subject: [PATCH] fixed transactions order

---
 src/pages/history-page/HistoryPageElement.ts |  2 +
 src/pages/wallet-page/WalletPageElement.ts   |  1 +
 src/styles/sidebar/sidebar.scss              | 52 ++++++++++----------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/pages/history-page/HistoryPageElement.ts b/src/pages/history-page/HistoryPageElement.ts
index 597143b..87cb812 100644
--- a/src/pages/history-page/HistoryPageElement.ts
+++ b/src/pages/history-page/HistoryPageElement.ts
@@ -39,6 +39,8 @@ class HistoryPageElement extends BasePageElement {
 					options['walletId'] = walletId;
 				}
 			}
+			options.embed = 'TransactionType';
+			options.sortBy = 'transactionDate|desc';
 			const response = await this.transactionsService.getAll(options);
 			return response;
 		} catch (err) {
diff --git a/src/pages/wallet-page/WalletPageElement.ts b/src/pages/wallet-page/WalletPageElement.ts
index 2dcfbfa..14ca618 100644
--- a/src/pages/wallet-page/WalletPageElement.ts
+++ b/src/pages/wallet-page/WalletPageElement.ts
@@ -51,6 +51,7 @@ class WalletPageElement extends BasePageElement {
 				}
 			}
 			options.embed = 'TransactionType';
+			options.sortBy = 'transactionDate|desc';
 			const response = await this.transactionsService.getAll(options);
 			return response;
 		} catch (err) {
diff --git a/src/styles/sidebar/sidebar.scss b/src/styles/sidebar/sidebar.scss
index 60f3931..47f6998 100644
--- a/src/styles/sidebar/sidebar.scss
+++ b/src/styles/sidebar/sidebar.scss
@@ -1,29 +1,31 @@
 menu-layout {
-    [data-target="menu-layout.appPage"] {
-        display: grid;
-        width: 100%;
-        min-height: 100vh;
-        grid-template-columns: 301px auto;
-        grid-template-areas: "sidebar content";
+	[data-target='menu-layout.appPage'] {
+		display: grid;
+		position: relative;
+		height: 100%;
+		width: 100%;
+		min-height: 100vh;
+		grid-template-columns: 301px auto;
+		grid-template-areas: 'sidebar content';
 
-        app-menu {
-            [data-target="app-menu.sidebar"] {
-                grid-area: sidebar;
-                position: absolute;
-                top: 0;
-                bottom: 0;
-                left: 0;
-                width: 301px;
-                border-right: 1px solid $gray-08;
-                background-color: $black;
-            }
-        }
+		app-menu {
+			[data-target='app-menu.sidebar'] {
+				grid-area: sidebar;
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				left: 0;
+				width: 301px;
+				border-right: 1px solid $gray-08;
+				background-color: $black;
+			}
+		}
 
-        app-slot {
-            [data-target="base-layout.content"] {
-                grid-area: content;
-                margin: 15px;
-            }
-        }
-    }
+		app-slot {
+			[data-target='base-layout.content'] {
+				grid-area: content;
+				margin: 15px;
+			}
+		}
+	}
 }