From 4c27ed31a185d4fb568ba138c6c4b35113b2a264 Mon Sep 17 00:00:00 2001
From: ImNotOssy <imnotossy420@gmail.com>
Date: Fri, 30 Aug 2024 15:29:39 -0500
Subject: [PATCH 1/2] Update fidelityAPI.py

---
 fidelityAPI.py | 65 +++++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/fidelityAPI.py b/fidelityAPI.py
index ca74d074..c94fb374 100644
--- a/fidelityAPI.py
+++ b/fidelityAPI.py
@@ -229,6 +229,20 @@ def fidelity_account_info(driver: webdriver) -> dict | None:
         driver.get("https://digital.fidelity.com/ftgw/digital/portfolio/positions")
         # Wait for page load
         WebDriverWait(driver, 10).until(check_if_page_loaded)
+        # Uncheck the "Pin Symbol column to left" setting
+        WebDriverWait(driver, 10).until(
+            expected_conditions.element_to_be_clickable(
+                (By.ID, "posweb-grid_top-settings-button")
+            )
+        ).click()
+        checkbox = driver.find_element(By.ID, "posweb-settings-modal-pinned-symbol-checkbox")
+        if checkbox.is_selected():
+            driver.execute_script("arguments[0].click();", checkbox)
+        WebDriverWait(driver, 10).until(
+            expected_conditions.element_to_be_clickable(
+                (By.XPATH, "//*[text()='Apply']/parent::*/parent::*")
+            )
+        ).click()
         # Get account numbers via javascript
         WebDriverWait(driver, 10).until(
             expected_conditions.presence_of_element_located(
@@ -281,33 +295,30 @@ def fidelity_holdings(fidelity_o: Brokerage, loop=None):
         driver: webdriver = fidelity_o.get_logged_in_objects(key)
         for account in fidelity_o.get_account_numbers(key):
             try:
-                driver.get(
-                    f"https://digital.fidelity.com/ftgw/digital/portfolio/positions#{account}"
-                )
-                # Wait for page load
-                WebDriverWait(driver, 10).until(check_if_page_loaded)
-                # Get holdings via javascript
-                WebDriverWait(driver, 10).until(
-                    expected_conditions.presence_of_element_located(
-                        (By.CLASS_NAME, "ag-pinned-left-cols-container")
-                    )
-                )
-                stocks_list = javascript_get_classname(
-                    driver, "ag-pinned-left-cols-container"
-                )
-                # Find 1-5 letter words surrounded by 2 spaces on each side
-                for i in range(len(stocks_list)):
-                    stocks_list[i].replace(" \n ", "").replace("*", "")
-                    stocks_list[i] = re.findall(
-                        r"(?<=\s{2})[a-zA-Z]{1,5}(?=\s{2})", stocks_list[i]
-                    )
-                stocks_list = stocks_list[0]
-                # holdings_info = javascript_get_classname(
-                #     driver, "ag-center-cols-container"
-                # )
-                # print(f"Holdings Info: {holdings_info}")
-                for stock in stocks_list:
-                    fidelity_o.set_holdings(key, account, stock, "N/A", "N/A")
+                driver.get(f"https://digital.fidelity.com/ftgw/digital/portfolio/positions#{account}")
+                sleep(2)
+                holdings_rows = driver.find_elements(By.XPATH, "//*[@id='posweb-grid']//div[contains(@class, 'posweb-row-position')]")
+                for row in holdings_rows:
+                    try:
+                        stock_ticker = row.find_element(By.XPATH, ".//div[contains(@col-id, 'sym')]//button").text
+                        if stock_ticker == "Cash":
+                            continue
+                        price_raw = row.find_element(By.XPATH, ".//div[@col-id='lstPrc']//span[@class='ag-cell-value']").text
+                        quantity_raw = row.find_element(By.XPATH, ".//div[@col-id='qty']//span[@class='ag-cell-value']").text
+                        # Clean up price and quantity
+                        invalid_strings = ["n/a", ""]
+                        if price_raw.lower() not in invalid_strings:
+                            price = round(float(price_raw.replace("$", "").replace(",", "").strip()), 2)
+                        else:
+                            price = "N/A"
+                        if quantity_raw.lower() not in invalid_strings:
+                            quantity = float(quantity_raw.replace(",", "").strip())
+                        else:
+                            quantity = "N/A"
+                        fidelity_o.set_holdings(key, account, stock_ticker, quantity, price)
+                    except Exception as e:
+                        print(f"Unexpected error processing row, skipping it: {str(e)}")
+                        continue
             except Exception as e:
                 fidelity_error(driver, e)
                 continue

From bb138b5b5947f390d17d714832d73f1965293f69 Mon Sep 17 00:00:00 2001
From: Nelson Dane <47427072+NelsonDane@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:33:15 -0400
Subject: [PATCH 2/2] remove re

---
 fidelityAPI.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fidelityAPI.py b/fidelityAPI.py
index c94fb374..2ebd715f 100644
--- a/fidelityAPI.py
+++ b/fidelityAPI.py
@@ -5,7 +5,6 @@
 import asyncio
 import datetime
 import os
-import re
 import traceback
 from time import sleep