pkmnct · superpowered · Jan 18, 2021 · Jan 18, 2021 · Jan 18, 2021 · Jan 18, 2021
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,7 @@ node_modules
 dist
 *.zip
 
-.stellar
+.vscode/*
+
+.stellar
+stellar
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/public/css/settings.css b/public/css/settings.css
@@ -1,3 +1,38 @@
 input[type="checkbox"]:checked + label:before, input[type="radio"]:checked + label:before {
     content: '✓';
 }
+
+.mutiple-accounts-wrapper {
+  display: none;
+}
+#setting-multipleAccountsEnabled:checked ~ .mutiple-accounts-wrapper {
+  display: block;
+}
+
+.mutiple-accounts-input-wrapper:first-child .multipleAccounts-delete{
+  display: none;
+}
+
+.mutiple-accounts-input-wrapper {
+  display: flex;
+  align-items: flex-end;
+  margin-bottom: 1.5em;
+}
+
+.mutiple-accounts-input-wrapper label {
+  width: calc(100% - 9em);
+  margin-right: 1em;
+  margin-bottom: 0;
+}
+
+.mutiple-accounts-input-wrapper label input {
+  width: 100%;
+}
+
+.multipleAccounts-delete {
+  width: 8em;
+}
+
+#main input[type="text"].error {
+  border-color: #762206;
+}
diff --git a/public/html/settings.html b/public/html/settings.html
@@ -8,6 +8,7 @@
     <link rel="stylesheet" href="/css/settings.css" />
     <link rel="icon" type="image/png" href="/images/icon128.png" />
   </head>
+
   <body class="is-preload">
     <!-- Wrapper -->
     <div id="wrapper">
@@ -20,14 +21,16 @@ <h1>Settings</h1>
       <!-- Nav -->
       <nav id="nav">
         <ul>
-          <li><a href="#welcome" class="active">Welcome Page</a></li>
+          <li><a href="#changeLog" class="active">Changelog</a></li>
           <li><a href="#triangleFix">Triangle Indicator Fix</a></li>
+          <li><a href="#debugMode">Debug Mode</a></li>
+          <li><a href="#multipleAccounts">Multiple Accounts</a></li>
         </ul>
       </nav>
 
       <!-- Main -->
       <main id="main">
-        <section id="welcome" class="main">
+        <section id="changeLog" class="main">
           <header class="major">
             <h2>Changelog</h2>
           </header>
@@ -38,6 +41,7 @@ <h2>Changelog</h2>
           <input type="checkbox" id="setting-changelogOnUpdate" name="setting-changelogOnUpdate" />
           <label for="setting-changelogOnUpdate">Display changelog on update</label>
         </section>
+
         <section id="triangleFix" class="main">
           <header class="major">
             <h2>Triangle Indicator Fix</h2>
@@ -49,6 +53,7 @@ <h2>Triangle Indicator Fix</h2>
           <input type="checkbox" id="setting-fixTriangle" name="setting-fixTriangle" />
           <label for="setting-fixTriangle">Triangle Indicator Fix</label>
         </section>
+
         <section id="debugMode" class="main">
           <header class="major">
             <h2>Debug Mode</h2>
@@ -60,6 +65,35 @@ <h2>Debug Mode</h2>
           <input type="checkbox" id="setting-debugMode" name="setting-debugMode" />
           <label for="setting-debugMode">Debug Mode</label>
         </section>
+
+        <section id="multipleAccounts" class="main">
+          <header class="major">
+            <h2>Multiple Accounts</h2>
+          </header>
+          <p>
+            TODO: all this text. Probably a warning about not changing these values after the fact or risking data
+            loss.<br />
+            Robinhood Name will probably have to be the Name (First Lase) on the robinhood Account. <br />
+          </p>
+          <input type="checkbox" id="setting-multipleAccountsEnabled" name="setting-multipleAccountsEnabled" />
+          <label for="setting-multipleAccountsEnabled">Allow Multiple Accounts</label>
+
+          <div class="mutiple-accounts-wrapper">
+            <div id="mutiple-account-rows"></div>
+            <template id="mutiple-accounts-input-wrapper-template">
+              <div class="mutiple-accounts-input-wrapper">
+                <label>
+                  RobinHood Account Name
+                  <input required type="text" class="setting-multipleAccounts-robinHoodInput" />
+                </label>
+                <button class="multipleAccounts-delete">Delete</button>
+              </div>
+            </template>
+            <button id="multipleAccounts-add">
+              Add Account
+            </button>
+          </div>
+        </section>
       </main>
 
       <!-- Footer -->
@@ -80,4 +114,5 @@ <h2>Debug Mode</h2>
     <script src="/js/external/stellar/main.js"></script>
     <script src="/js/settings.js"></script>
   </body>
-</html>
+
+</html>
diff --git a/src/background/main.ts b/src/background/main.ts
@@ -30,6 +30,21 @@ const eventHandlers = {
       active: false,
     });
   },
+  "mint-force-sync": () => {
+    // TODO: This got removed in an earlier commit. Check if replaced?
+    debug.log("trigger-sync event");
+    // Send notification
+    chrome.tabs.sendMessage(mintTab, {
+      status: "Syncing Mint with Robinhood.",
+      persistent: true,
+    });
+
+    // Trigger the sync
+    chrome.tabs.create({
+      url: urls.robinhood.scrape,
+      active: false,
+    });
+  },
   // This event is emitted by the main Robinhood content script.
   "robinhood-login-needed": ({ sender }: eventHandler) => {
     debug.log("robinhood-login-needed event");
@@ -134,11 +149,15 @@ const eventHandlers = {
     }
   },
   // This event is emitted by the Mint property update content script.
-  "mint-sync-complete": () => {
+  "mint-sync-complete": ({ message }) => {
     debug.log("mint-sync-complete event");
     chrome.storage.sync.set({ syncTime: new Date().toString() });
+    let account = "";
+    if (message.account) {
+      account = " " + message.account; // TODO: sanitize
+    }
     chrome.tabs.sendMessage(mintTab, {
-      status: "Sync Complete! Reload to see the change.",
+      status: "Sync Complete! Reload to see the change." + account,
       link: "/overview.event",
       linkText: "Reload",
       persistent: true,
@@ -219,8 +238,40 @@ const eventHandlers = {
     chrome.storage.sync.set({ needsOldPropertyRemoved: true });
     if (!debug.isEnabled()) chrome.tabs.remove(sender.tab.id);
   },
+  // This event is emitted by the Mint property check content script.
+  "mint-property-non-multiple-remove": ({ sender }: eventHandler) => {
+    debug.log("mint-property-non-multiple-remove event");
+    chrome.tabs.sendMessage(mintTab, {
+      status:
+        "Your account appears to have data from a non multiple account setup. Please remove the old 'Robinhood Cash', 'Robinhood Stocks', 'Robinhood Crypto' & 'Robinhood Other' properties from Mint to prevent duplication of your portfolio balance. Reload the overview to sync after removing the property.",
+      persistent: true,
+      link: "https://mint.intuit.com/settings.event?filter=property",
+      linkText: "Mint Properties",
+      newTab: true,
+    });
+    chrome.storage.sync.set({ needsOldPropertyRemoved: true });
+    if (!debug.isEnabled()) chrome.tabs.remove(sender.tab.id);
+  },
+  // This event is emitted by the Mint property check content script.
+  "mint-property-non-single-remove": ({ sender }: eventHandler) => {
+    debug.log("mint-property-non-multiple-remove event");
+    chrome.tabs.sendMessage(mintTab, {
+      status:
+        "Your account appears to have data from a multiple account setup. Please remove the old 'Robinhood Cash - [ACCOUNT_ NAME]', 'Robinhood Stocks - [ACCOUNT_ NAME]', 'Robinhood Crypto - [ACCOUNT_ NAME]' & 'Robinhood Other - [ACCOUNT_ NAME]' properties from Mint to prevent duplication of your portfolio balance. Reload the overview to sync after removing the property.",
+      persistent: true,
+      link: "https://mint.intuit.com/settings.event?filter=property",
+      linkText: "Mint Properties",
+      newTab: true,
+    });
+    chrome.storage.sync.set({ needsOldPropertyRemoved: true });
+    if (!debug.isEnabled()) chrome.tabs.remove(sender.tab.id);
+  },
 };
 
 chrome.runtime.onMessage.addListener((message, sender) => {
-  eventHandlers[message.event]({ message, sender });
+  if (message && message.event && typeof eventHandlers[message.event] === "function") {
+    eventHandlers[message.event]({ message, sender });
+  } else {
+    throw new Error(message.event);
+  }
 });
diff --git a/src/content/mint/properties/check.ts b/src/content/mint/properties/check.ts
@@ -13,54 +13,47 @@ new Overlay("Performing Initial Setup. Please Wait...", "This window will automa
 export const robinhoodProperties = ["Cash", "Stocks", "Crypto", "Other"];
 
 // Function to check if the propert exists on the page
-const checkIfPropertyExists = (property) => {
+const checkIfPropertyExists = (property, looseCheck = false) => {
   debug.log("Checking if property exists:", property);
 
   const propertyElements = document.querySelectorAll(".OtherPropertyView");
 
   let foundProperty = false;
   for (const propertyElement of propertyElements) {
-    if ((propertyElement as HTMLElement).innerText.includes(`Robinhood ${property}`)) {
+    const titleElement = propertyElement.querySelector(".summaryView span:first-child") as HTMLElement;
+    const title = titleElement.innerText.trim();
+    if (title === `Robinhood ${property}`) {
       debug.log(`Found property "${property}"`, propertyElement);
       foundProperty = true;
       // Stop searching
       break;
+    } else if (looseCheck && title.includes(`Robinhood ${property}`)) {
+      debug.log(`Found property "${property}" - loose check`, propertyElement);
+      foundProperty = true;
+      break;
     }
   }
   return foundProperty;
 };
 
-const setupProperties = () => {
+const setupProperties = (subLabel = "") => {
   // Need to keep track of how many properties we added to ensure each gets set up before initiating sync
   let newProperties = 0;
 
   robinhoodProperties.forEach((property) => {
-    if (!checkIfPropertyExists(property)) {
-      debug.log(`Could not find "${property}", adding it.`);
+    if (!checkIfPropertyExists(property + subLabel)) {
+      debug.log(`Could not find "${property + subLabel}", adding it.`);
+
       // Trigger setup of property
       chrome.runtime.sendMessage({
         event: "mint-create",
-        property,
+        property: property + subLabel,
       });
       newProperties++;
     }
   });
 
-  // Check for old version
-  if (checkIfPropertyExists("Account")) {
-    debug.log("Found old Robinhood Account property. This must be removed to finish setup.");
-    chrome.runtime.sendMessage({
-      event: "mint-property-remove",
-    });
-    return;
-  }
-
-  // Success.
-  debug.log("Finishing Setup");
-  chrome.runtime.sendMessage({
-    event: "mint-property-setup-complete",
-    newProperties,
-  });
+  return newProperties;
 };
 
 window.addEventListener("load", () => {
@@ -70,7 +63,87 @@ window.addEventListener("load", () => {
     failureAttempts: 20,
     callback: (result) => {
       debug.log("Found Property View. Setting up properties.", result);
-      setupProperties();
+      chrome.storage.sync.get(
+        {
+          multipleAccountsEnabled: false,
+          multipleAccounts: [],
+        },
+        (result) => {
+          const { multipleAccountsEnabled, multipleAccounts } = result;
+          if (multipleAccountsEnabled && multipleAccounts && multipleAccounts.length) {
+            let newProperties = 0;
+            multipleAccounts.forEach((account) => {
+              const subLabel = ` - ${account.robinHoodValue}`;
+              newProperties += setupProperties(subLabel);
+            });
+
+            // Check for old version
+            if (checkIfPropertyExists("Account")) {
+              debug.log("Found old Robinhood Account property. This must be removed to finish setup.");
+              chrome.runtime.sendMessage({
+                event: "mint-property-remove",
+              });
+              return;
+            }
+
+            // Check for old non multiple account version
+            // Check for old multiple account version
+            let singleCheck = false;
+            robinhoodProperties.forEach((property) => {
+              if (checkIfPropertyExists(`${property}`)) {
+                singleCheck = true;
+              }
+            });
+            if (singleCheck) {
+              debug.log("Found old Robinhood Non Multiple Account property. This must be removed to finish setup.");
+              chrome.runtime.sendMessage({
+                event: "mint-property-non-multiple-remove",
+              });
+              return;
+            }
+
+            // Success.
+            debug.log("Finishing Setup");
+            chrome.runtime.sendMessage({
+              event: "mint-property-setup-complete",
+              newProperties,
+            });
+            return;
+          }
+          const newProperties = setupProperties();
+
+          // Check for old version
+          if (checkIfPropertyExists("Account")) {
+            debug.log("Found old Robinhood Account property. This must be removed to finish setup.");
+            chrome.runtime.sendMessage({
+              event: "mint-property-remove",
+            });
+            return;
+          }
+
+          // Check for old multiple account version
+          let multipleCheck = false;
+          robinhoodProperties.forEach((property) => {
+            if (checkIfPropertyExists(`${property} -`, true)) {
+              multipleCheck = true;
+            }
+          });
+          if (multipleCheck) {
+            debug.log("Found old Robinhood Multiple Account property. This must be removed to finish setup.");
+            chrome.runtime.sendMessage({
+              event: "mint-property-non-single-remove",
+            });
+            return;
+          }
+
+          // Success.
+          debug.log("Finishing Setup");
+          chrome.runtime.sendMessage({
+            event: "mint-property-setup-complete",
+            newProperties,
+          });
+        }
+      );
     },
     onError: () => {
       // If we don't find the OtherPropertyView, check if no properties are set up