Change location of Trade Chat Timer.

Author: Sashank999

.gitignore

@@ -5,4 +5,8 @@
 .vscode
 
 extension/scripts/jshint.json
-extension/scripts/eslint.json
+extension/scripts/eslint.json
+.gitignore
+
+extension/find.txt
+extension/find.txtf

extension/changelog.json

@@ -3,7 +3,9 @@
 		"version": { "major": 6, "minor": 20, "build": 0 },
 		"title": "Beta",
 		"date": false,
-		"logs": { "features": [], "fixes": [], "changes": [], "removed": [] }
+		"logs": { "features": [], "fixes": [], "changes": [
+			{ "message": "Change the location of Trade Chat Timer.", "contributor": "TheFoxMan" }
+		], "removed": [] }
 	},
 	{
 		"version": { "major": 6, "minor": 19, "build": 0 },

extension/scripts/content/global/ttGlobal.entry.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const countdownTimers = [];
+let countdownTimers = [];
 const countTimers = [];
 
 (async () => {

extension/scripts/features/trade-timer/ttTradeTimer.css

@@ -17,3 +17,8 @@
 #tt-trade-timer:not([data-seconds]) {
 	background: var(--tt-color-green);
 }
+
+[class*="chat-box-footer__"].tt-modified [class*="chat-box-footer__send-icon-wrapper__"] {
+	display: flex;
+	flex-flow: column;
+}

extension/scripts/features/trade-timer/ttTradeTimer.js

@@ -6,7 +6,7 @@
 		"chat",
 		() => settings.pages.chat.tradeTimer,
 		initialise,
-		detectChat,
+		showTimer,
 		cleanup,
 		{
 			storage: ["settings.pages.chat.tradeTimer", "localdata.tradeMessage"],
@@ -18,21 +18,22 @@
 		CUSTOM_LISTENERS[EVENT_CHANNELS.CHAT_OPENED].push(({ chat }) => {
 			if (chat.find("[class*='chat-box-header__info__']").textContent !== "Trade") return;
 
-			listenTradeChatInput(chat);
+			showTimer(chat);
 		});
 	}
 
 	let timer;
-	async function detectChat() {
+	async function showTimer(tradeChat = null) {
 		await requireChatsLoaded();
 
-		const tradeChatButton = document.find("#chatRoot [class*='minimized-menu-item__'][title='Trade']");
-		if (!tradeChatButton) {
-			console.error("TornTools - Trade Chat Button not found.");
-			return;
-		}
+		if (!tradeChat)
+			tradeChat = getTradeChat();
+
+		if (!tradeChat) return;
+
+		const sendButton = tradeChat.find("[class*='chat-box-footer__send-icon-wrapper__']");
+		sendButton.parentElement.classList.add("tt-modified");
 
-		tradeChatButton.find("svg").classList.add("tt-hidden");
 		if (!timer) {
 			timer = document.newElement({
 				type: "div",
@@ -43,7 +44,8 @@
 				},
 			});
 		}
-		if (!countdownTimers.includes(timer)) countdownTimers.push(timer);
+		countdownTimers = countdownTimers.filter((x) => x.getAttribute("id") !== "tt-trade-timer");
+		countdownTimers.push(timer);
 
 		const now = Date.now();
 		if (localdata.tradeMessage > now) {
@@ -52,9 +54,10 @@
 		} else {
 			timer.textContent = "OK";
 		}
-		tradeChatButton.appendChild(timer);
 
-		listenTradeChatInput();
+		sendButton.insertAdjacentElement("afterbegin", timer);
+
+		listenTradeChatInput(tradeChat);
 	}
 
 	function getTradeChat() {
@@ -64,7 +67,7 @@
 		return [...openChats].filter((chat) => chat.find("[class*='chat-box-header__info__']").textContent === "Trade")?.[0];
 	}
 
-	function listenTradeChatInput(tradeChat = null) {
+	function listenTradeChatInput(tradeChat) {
 		if (!tradeChat) tradeChat = getTradeChat();
 		if (!tradeChat) return;
 
@@ -73,7 +76,6 @@
 
 	async function onKeyUp(event) {
 		if (event.key !== "Enter") return;
-		// if (!event.target.value) return;
 
 		const tradeChat = event.target.closest("[class^='chat-box__']");
 		const chatBody = tradeChat.find("[class*='chat-box-body___']");
@@ -101,12 +103,11 @@
 		timer.remove();
 		timer = null;
 
-		const tradeChatButton = document.find("#chatRoot [class*='minimized-menu-item__'][title='Trade']");
-		if (tradeChatButton) tradeChatButton.find("svg").classList.remove("tt-hidden");
-
 		const tradeChat = getTradeChat();
 		if (!tradeChat) return;
 
+		tradeChat.find("[class*='chat-box-footer__send-icon-wrapper__']").parentElement.classList.remove("tt-modified");
+
 		tradeChat.find("textarea").removeEventListener("keypress", onKeyUp);
 	}
 })();

extension/scripts/global/functions/requires.js

@@ -37,9 +37,9 @@ function requireCondition(condition, options = {}) {
 			if (options.maxCycles <= 0) return false;
 
 			if (count > options.maxCycles) {
-				console.error("TornTools - Maximum cycles reached. Please report this to TornTools developers.");
-				console.trace();
-				reject("Maximum cycles reached.");
+				// console.error("TornTools - Maximum cycles reached. Please report this to TornTools developers.");
+				// console.trace();
+				reject(new Error("Maximum cycles reached."));
 				return true;
 			}
 			return false;