hedgequantx 2.3.8 → 2.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "HedgeQuantX - Prop Futures Trading CLI",
   "main": "src/app.js",
   "bin": {

package/src/pages/accounts.js

@@ -88,8 +88,8 @@ const showAccounts = async (service) => {
       const acc1 = allAccounts[i];
       const acc2 = allAccounts[i + 1];
 
-      const name1 = String(acc1.accountId || acc1.accountName || `Account #${i + 1}`);
-      const name2 = acc2 ? String(acc2.accountId || acc2.accountName || `Account #${i + 2}`) : '';
+      const name1 = String(acc1.accountName || acc1.rithmicAccountId || acc1.accountId || `Account #${i + 1}`);
+      const name2 = acc2 ? String(acc2.accountName || acc2.rithmicAccountId || acc2.accountId || `Account #${i + 2}`) : '';
 
       draw2ColHeader(name1.substring(0, col1 - 4), name2 ? name2.substring(0, col2 - 4) : '', boxWidth);
 

package/src/pages/algo/copy-trading.js

@@ -168,7 +168,7 @@ const selectAccount = async (message, accounts, excludeIdx) => {
       const acc = x.a.account;
       const balance = acc.balance !== null ? ` ($${acc.balance.toLocaleString()})` : '';
       return {
-        label: `${x.a.propfirm} - ${acc.rithmicAccountId || acc.name || acc.accountId}${balance}`,
+        label: `${x.a.propfirm} - ${acc.accountName || acc.rithmicAccountId || acc.name || acc.accountId}${balance}`,
         value: x.i,
       };
     });

package/src/pages/algo/one-account.js

@@ -48,8 +48,9 @@ const oneAccountMenu = async (service) => {
   spinner.succeed(`Found ${activeAccounts.length} active account(s)`);
   
   // Select account
+  // Display name priority: accountName (ProjectX) > rithmicAccountId (Rithmic) > name > accountId
   const options = activeAccounts.map(acc => ({
-    label: `${acc.rithmicAccountId || acc.name || acc.accountId} (${acc.propfirm || 'Unknown'})${acc.balance !== null ? ` - $${acc.balance.toLocaleString()}` : ''}`,
+    label: `${acc.accountName || acc.rithmicAccountId || acc.name || acc.accountId} (${acc.propfirm || 'Unknown'})${acc.balance !== null ? ` - $${acc.balance.toLocaleString()}` : ''}`,
     value: acc
   }));
   options.push({ label: '< Back', value: 'back' });

package/src/pages/orders.js

@@ -68,7 +68,7 @@ const showOrders = async (service) => {
     let allOrders = [];
     
     for (const account of allAccounts) {
-      const accName = String(account.accountId || account.accountName || 'Unknown').substring(0, 20);
+      const accName = String(account.accountName || account.rithmicAccountId || account.accountId || 'Unknown').substring(0, 20);
       spinner = ora({ text: `Fetching orders for ${accName}...`, color: 'yellow' }).start();
       
       try {
@@ -77,7 +77,7 @@ const showOrders = async (service) => {
           result.orders.forEach(order => {
             allOrders.push({ 
               ...order, 
-              accountName: account.accountId, 
+              accountName: account.accountName || account.rithmicAccountId || account.accountId, 
               propfirm: account.propfirm 
             });
           });

package/src/pages/positions.js

@@ -68,7 +68,7 @@ const showPositions = async (service) => {
     let allPositions = [];
     
     for (const account of allAccounts) {
-      const accName = String(account.accountId || account.accountName || 'Unknown').substring(0, 20);
+      const accName = String(account.accountName || account.rithmicAccountId || account.accountId || 'Unknown').substring(0, 20);
       spinner = ora({ text: `Fetching positions for ${accName}...`, color: 'yellow' }).start();
       
       try {
@@ -77,7 +77,7 @@ const showPositions = async (service) => {
           result.positions.forEach(pos => {
             allPositions.push({ 
               ...pos, 
-              accountName: account.accountId, 
+              accountName: account.accountName || account.rithmicAccountId || account.accountId, 
               propfirm: account.propfirm 
             });
           });