feat: FIFA 21

Update for FIFA 21 with all functionality from last year.

Co-authored-by: Eimar Fandino <eimar.fandino.hurtado@nl.abnamro.com>
Co-authored-by: Tim Klingeleers <Mardaneus86@users.noreply.github.com>

BREAKING CHANGE: no longer works for FIFA 20

.eslintignore

@@ -0,0 +1,4 @@
+dist/
+tampermonkey-headers.js
+webpack.config.js
+webpack.config.prd.js

.gitignore

@@ -1,2 +1,3 @@
 dist/
 node_modules/
+.vscode/

README.md

@@ -2,9 +2,9 @@
 
 [![Join the chat at https://gitter.im/futwebapp-tampermonkey/Lobby](https://badges.gitter.im/futwebapp-tampermonkey/Lobby.svg)](https://gitter.im/futwebapp-tampermonkey/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-FIFA 20's companion app for FIFA Ultimate Team, the FUT 20 Web App, is a website that let's you trade and manage your team on the go.
+FIFA 21's companion app for FIFA Ultimate Team, the FUT 21 Web App, is a website that let's you trade and manage your team on the go.
 
-This TamperMonkey script is meant to enhance the FUT 20 Web App experience. You can install the script following the instructions below. Afterwards you will get a settings button on the bottom right of the web app, where you can enable every feature by itself. The script provides a certain degree of customization possibilities.
+This TamperMonkey script is meant to enhance the FUT 21 Web App experience. You can install the script following the instructions below. Afterwards you will get a settings button on the bottom right of the web app, where you can enable every feature by itself. The script provides a certain degree of customization possibilities.
 
 :warning: Using this script is at your own risk. EA might (temp-)ban you for altering parts of their Web App.
 

app/futbin/futbin-player-links.js

@@ -85,11 +85,11 @@ export class FutbinPlayerLinks extends BaseScript {
       let futbinPlayerIds = Database.getJson('futbin-player-ids', []);
       const futbinPlayer = futbinPlayerIds.find(i => i.id === item.resourceId);
       if (futbinPlayer != null) {
-        return resolve(`https://www.futbin.com/20/player/${futbinPlayer.futbinId}`);
+        return resolve(`https://www.futbin.com/21/player/${futbinPlayer.futbinId}`);
       }
 
       const name = `${item._staticData.firstName} ${item._staticData.lastName}`.replace(' ', '+');
-      const url = `https://www.futbin.com/search?year=20&term=${name}`;
+      const url = `https://www.futbin.com/search?year=21&term=${name}`;
       return GM_xmlhttpRequest({
         method: 'GET',
         url,
@@ -114,10 +114,10 @@ export class FutbinPlayerLinks extends BaseScript {
               });
             }
             Database.setJson('futbin-player-ids', futbinPlayerIds);
-            return resolve(`https://www.futbin.com/20/player/${exactPlayers[0].id}`);
+            return resolve(`https://www.futbin.com/21/player/${exactPlayers[0].id}`);
           } else if (exactPlayers.length > 1) {
             // Take first one, several players are returned more than once
-            return resolve(`https://www.futbin.com/20/player/${exactPlayers[0].id}`);
+            return resolve(`https://www.futbin.com/21/player/${exactPlayers[0].id}`);
           }
 
           return resolve(null); // TODO: what should we do if we find more than one?

app/futbin/futbin-prices.js

@@ -227,7 +227,7 @@ export class FutbinPrices extends BaseScript {
         const fetchAtOnce = 30;
         const futbinlist = [];
         while (resourceIdMapping.length > 0 && fetchedPlayers < resourceIdMapping.length && Database.get('lastFutbinFetchFail', 0) + (5 * 60000) < Date.now()) {
-          const futbinUrl = `https://www.futbin.com/20/playerPrices?player=&rids=${
+          const futbinUrl = `https://www.futbin.com/21/playerPrices?player=&rids=${
             resourceIdMapping.slice(fetchedPlayers, fetchedPlayers + fetchAtOnce)
               .map(i => i.playerId)
               .filter((current, next) => current !== next && current !== 0)

app/futbin/style/futbin-prices.scss

@@ -29,6 +29,11 @@
   width: 25%;
   float: right;
 }
+
+.listFUTItem .auction {
+  display: block;
+}
+
 .listFUTItem .auction .auctionValue {
   width: 24%;
   float: left;

app/index.js

@@ -1,5 +1,5 @@
-/* globals onVisibilityChanged services UTNavigationController
-UTViewController UTObservable window document $ */
+/* globals onVisibilityChanged services UTGameFlowNavigationController
+UTViewController EAObservable window document $ */
 import 'babel-polyfill';
 import './index.scss';
 import initSettingsScreen from './settings';
@@ -32,16 +32,11 @@ import {
 } from './club';
 */
 
-window.onPageNavigation = new UTObservable();
+window.onPageNavigation = new EAObservable();
 
 window.currentPage = '';
 
-// prevent debugger trap
-setInterval(() => {
-  _0x1a026c = function () {}; // eslint-disable-line no-global-assign, no-undef
-}, 500);
-
-UTNavigationController.prototype.didPush = (t) => {
+UTGameFlowNavigationController.prototype.didPush = (t) => {
   if (t) {
     analytics.trackPage(t.className);
     window.onPageNavigation.notify(t.className);

app/index.scss

@@ -3,7 +3,7 @@
 
     .ut-content {
         border: 0;
-        
+
         &.ut-content--split-view-extend {
             max-height: 100%;
         }

app/instant-bin-confirm/instant-bin-confirm.js

@@ -1,7 +1,8 @@
 /* global
 gPopupClickShield
 enums
-controllers
+EADialogViewController
+services
 utils
 */
 
@@ -34,10 +35,14 @@ export class InstantBinConfirm extends BaseScript {
         proceed();
         return;
       }
-      const n = new controllers.views.popups.Dialog(
-        dialog.message, dialog.title,
-        enums.UIDialogTypes.MESSAGE, amount, dialog.buttonLabels,
-      );
+
+      const n = new EADialogViewController({
+        dialogOptions: [dialog.buttonLabels[0],
+          dialog.buttonLabels[1]],
+        message: services.Localization.localize(dialog.message, amount),
+        title: services.Localization.localize(dialog.title),
+      });
+
       n.init();
       gPopupClickShield.setActivePopup(n);
       n.onExit.observe(this, (e, t) => {
@@ -47,6 +52,8 @@ export class InstantBinConfirm extends BaseScript {
           } else if (cancel) {
             cancel();
           }
+        } else {
+          cancel();
         }
       });
     };

app/settings/index.scss

@@ -8,7 +8,7 @@
     font-family: UltimateTeam-Icons,sans-serif;
     content: "\E056";
     font-size: 2rem;
-    color: black;
+    color: gray;
   }
 }
 
@@ -24,13 +24,18 @@
   z-index: 998;
   padding: 15px;
 
+  label {
+    color: black;
+  }
+
   &, *, *:before, *:after {
     box-sizing: border-box;
   }
 
   footer {
     text-align: center;
     padding: 15px;
+    color: black;
 
     hr {
       border: none;

app/transferlist/min-bin.js

@@ -100,7 +100,7 @@ class MinBin extends BaseScript {
 
           GM_notification({
             text: notificationText,
-            title: 'FUT 20 Web App',
+            title: 'FUT 21 Web App',
             timeout: 5000,
             onclick: () => window.focus(),
           });