From 52bea948bf4cd277ca7cfbf75bc533985bba02dc Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Wed, 5 Mar 2014 22:50:31 -0600
Subject: [PATCH] Support optimized updateChallenges

See the corresponding server commit Zarel/Pokemon-Showdown@d5b528dbcc
---
 js/client-mainmenu.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
index fc24b8c64..0703d3af5 100644
--- a/js/client-mainmenu.js
+++ b/js/client-mainmenu.js
@@ -388,14 +388,15 @@
 				var userid = $pmWindow.data('userid');
 				var name = $pmWindow.data('name');
 				if (data.challengesFrom[userid]) {
-					var challenge = data.challengesFrom[userid];
+					var format = data.challengesFrom[userid];
+					if (format.format) format = format.format;
 					if (!$pmWindow.find('.challenge').length) {
-						self.notifyOnce("Challenge from "+name, "Format: "+Tools.escapeFormat(challenge.format), 'challenge:'+userid);
+						self.notifyOnce("Challenge from "+name, "Format: "+Tools.escapeFormat(format), 'challenge:'+userid);
 					}
 					var $challenge = self.openChallenge(name, $pmWindow);
 					var buf = '<form class="battleform"><p>'+Tools.escapeHTML(name)+' wants to battle!</p>';
-					buf += '<p><label class="label">Format:</label>'+self.renderFormats(challenge.format, true)+'</p>';
-					buf += '<p><label class="label">Team:</label>'+self.renderTeams(challenge.format)+'</p>';
+					buf += '<p><label class="label">Format:</label>'+self.renderFormats(format, true)+'</p>';
+					buf += '<p><label class="label">Team:</label>'+self.renderTeams(format)+'</p>';
 					buf += '<p class="buttonbar"><button name="acceptChallenge"><strong>Accept</strong></button> <button name="rejectChallenge">Reject</button></p></form>';
 					$challenge.html(buf);
 				} else {