Merge branch 'main' into bot

api/app/blueprints/portfolio.py

@@ -33,6 +33,9 @@ def get_portfolio():
     # Otherwise calculate portfolio
     if transactions is not None:
         for row in transactions:
+            if row[2] == 0:
+                continue
+            else:
                 data = {
                     "isin": row[0],
                     "comment": row[1],

api/app/blueprints/transactions.py

@@ -67,7 +67,7 @@ def get_transaction():
     return_transactions = []
 
     # Get all transactions
-    transactions = db.session.query(Transaction).filter_by(email=email).all()
+    transactions = db.session.query(Transaction).filter_by(email=email).order_by(Transaction.time.desc()).all()
 
     # Iterate over transactions and add them to return_transactions
     if transactions is not None: