Android build v1.1.19

src/modes/iwt2/screens/Iwt2ShellScreens.tsx

@@ -176,6 +176,7 @@ export function Iwt2ActionList({ actions }: Iwt2ActionListProps) {
         <button
           className={`iwt2-action-row ${selectedIndex === index ? 'game-selected selected' : ''}`}
           data-controller-nav="skip"
+          data-game-selected={selectedIndex === index ? 'true' : undefined}
           disabled={action.disabled}
           key={action.key}
           onClick={action.onConfirm}
@@ -292,6 +293,7 @@ export function Iwt2RoguelikeScreen({
   onContentTypeChange,
   onStart,
   onVariantChange,
+  queueMessage,
   variant,
 }: {
   contentType: Iwt2RoguelikeContentType
@@ -299,6 +301,7 @@ export function Iwt2RoguelikeScreen({
   onContentTypeChange: (contentType: Iwt2RoguelikeContentType) => void
   onStart: () => void
   onVariantChange: (variant: Iwt2RoguelikeVariant) => void
+  queueMessage?: string
   variant: Iwt2RoguelikeVariant
 }) {
   const gameMode = getGameMode()
@@ -403,6 +406,7 @@ export function Iwt2RoguelikeScreen({
         <button
           className={`back-button ${selected('back') ? 'game-selected' : ''}`}
           data-controller-nav="skip"
+          data-game-selected={selected('back') ? 'true' : undefined}
           onClick={onBack}
           onPointerDown={() => select('back')}
           type="button"
@@ -414,6 +418,7 @@ export function Iwt2RoguelikeScreen({
         <button
           className={`text-button ${variant === 'pve' ? 'active' : ''} ${selected('variant-pve') ? 'game-selected' : ''}`}
           data-controller-nav="skip"
+          data-game-selected={selected('variant-pve') ? 'true' : undefined}
           onClick={() => open('variant-pve')}
           onPointerDown={() => select('variant-pve')}
           type="button"
@@ -423,6 +428,7 @@ export function Iwt2RoguelikeScreen({
         <button
           className={`text-button ${variant === 'pvp' ? 'active' : ''} ${selected('variant-pvp') ? 'game-selected' : ''}`}
           data-controller-nav="skip"
+          data-game-selected={selected('variant-pvp') ? 'true' : undefined}
           onClick={() => open('variant-pvp')}
           onPointerDown={() => select('variant-pvp')}
           type="button"
@@ -441,6 +447,7 @@ export function Iwt2RoguelikeScreen({
               <button
                 className={`text-button ${contentType === 'dungeon' ? 'active' : ''} ${selected('pve-dungeon') ? 'game-selected' : ''}`}
                 data-controller-nav="skip"
+                data-game-selected={selected('pve-dungeon') ? 'true' : undefined}
                 onClick={() => open('pve-dungeon')}
                 onPointerDown={() => select('pve-dungeon')}
                 type="button"
@@ -450,6 +457,7 @@ export function Iwt2RoguelikeScreen({
               <button
                 className={`text-button ${contentType === 'raid' ? 'active' : ''} ${selected('pve-raid') ? 'game-selected' : ''}`}
                 data-controller-nav="skip"
+                data-game-selected={selected('pve-raid') ? 'true' : undefined}
                 onClick={() => open('pve-raid')}
                 onPointerDown={() => select('pve-raid')}
                 type="button"
@@ -467,6 +475,7 @@ export function Iwt2RoguelikeScreen({
             <button
               className={`text-button ${selected('pve-start') ? 'game-selected' : ''}`}
               data-controller-nav="skip"
+              data-game-selected={selected('pve-start') ? 'true' : undefined}
               onClick={() => open('pve-start')}
               onPointerDown={() => select('pve-start')}
               type="button"
@@ -487,6 +496,7 @@ export function Iwt2RoguelikeScreen({
               <button
                 className={`text-button ${contentType === 'dungeon' ? 'active' : ''} ${selected('pvp-dungeon') ? 'game-selected' : ''}`}
                 data-controller-nav="skip"
+                data-game-selected={selected('pvp-dungeon') ? 'true' : undefined}
                 onClick={() => open('pvp-dungeon')}
                 onPointerDown={() => select('pvp-dungeon')}
                 type="button"
@@ -496,6 +506,7 @@ export function Iwt2RoguelikeScreen({
               <button
                 className={`text-button ${contentType === 'raid' ? 'active' : ''} ${selected('pvp-raid') ? 'game-selected' : ''}`}
                 data-controller-nav="skip"
+                data-game-selected={selected('pvp-raid') ? 'true' : undefined}
                 onClick={() => open('pvp-raid')}
                 onPointerDown={() => select('pvp-raid')}
                 type="button"
@@ -505,6 +516,7 @@ export function Iwt2RoguelikeScreen({
               <button
                 className={`text-button ${contentType === 'stadium' ? 'active' : ''} ${selected('pvp-stadium') ? 'game-selected' : ''}`}
                 data-controller-nav="skip"
+                data-game-selected={selected('pvp-stadium') ? 'true' : undefined}
                 onClick={() => open('pvp-stadium')}
                 onPointerDown={() => select('pvp-stadium')}
                 type="button"
@@ -517,11 +529,12 @@ export function Iwt2RoguelikeScreen({
             <span>{gameMode === 'offline' ? 'C' : 'Q'}</span>
             <div>
               <strong>{pvpCardTitle}</strong>
-              <small>{pvpCardCopy}</small>
+              <small>{queueMessage || pvpCardCopy}</small>
             </div>
             <button
               className={`text-button ${selected('pvp-start') ? 'game-selected' : ''}`}
               data-controller-nav="skip"
+              data-game-selected={selected('pvp-start') ? 'true' : undefined}
               onClick={() => open('pvp-start')}
               onPointerDown={() => select('pvp-start')}
               type="button"
@@ -652,7 +665,7 @@ export function Iwt2RoguelikeUpgradeScreen({
       setSelectedIndex((current) => moveUpgradeSelection(entries, current, action))
       return
     }
-    if ((action === 'back' || action === 'pause') && !pvpUpgrade) {
+    if (action === 'back' || action === 'pause') {
       onBack()
     }
   })
@@ -682,6 +695,7 @@ export function Iwt2RoguelikeUpgradeScreen({
                 <button
                   className={`${activeBuffId === choice.id && pvpUpgrade ? 'selected-upgrade' : ''} ${entrySelected('upgradeBuff', index) ? 'game-selected' : ''}`}
                   data-controller-nav="skip"
+                  data-game-selected={entrySelected('upgradeBuff', index) ? 'true' : undefined}
                   key={choice.id}
                   onClick={() => {
                     if (pvpUpgrade) setSelectedBuffId(choice.id)
@@ -704,6 +718,7 @@ export function Iwt2RoguelikeUpgradeScreen({
                   <button
                     className={`${activeDebuffId === choice.id ? 'selected-upgrade' : ''} ${entrySelected('upgradeDebuff', index) ? 'game-selected' : ''}`}
                     data-controller-nav="skip"
+                    data-game-selected={entrySelected('upgradeDebuff', index) ? 'true' : undefined}
                     key={choice.id}
                     onClick={() => setSelectedDebuffId(choice.id)}
                     onPointerDown={() => setCursor('upgradeDebuff', index)}
@@ -731,6 +746,7 @@ export function Iwt2RoguelikeUpgradeScreen({
           <button
             className={`secondary-result-button ${entrySelected('upgradeContinue') ? 'game-selected' : ''}`}
             data-controller-nav="skip"
+            data-game-selected={entrySelected('upgradeContinue') ? 'true' : undefined}
             disabled={!activeBuffId || !activeDebuffId}
             onClick={() => {
               if (activeBuffId && activeDebuffId) onChoose(activeBuffId, activeDebuffId)
@@ -744,6 +760,7 @@ export function Iwt2RoguelikeUpgradeScreen({
           <button
             className={`secondary-result-button ${entrySelected('upgradeLeave') ? 'game-selected' : ''}`}
             data-controller-nav="skip"
+            data-game-selected={entrySelected('upgradeLeave') ? 'true' : undefined}
             onClick={onBack}
             onPointerDown={() => setCursor('upgradeLeave')}
             type="button"