Refactor and fixed done trades display issue for self-trade