@robotical/webapp-types 3.22.1 → 3.22.3

package/dist-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marty-web-app",
-    "version": "3.22.1",
+    "version": "3.22.3",
     "private": true,
     "engines": {
         "node": ">=20"
@@ -8,14 +8,14 @@
     "dependencies": {
         "@radix-ui/react-dropdown-menu": "^2.1.2",
         "@radix-ui/react-icons": "^1.3.2",
-        "@robdobsn/raftjs": "^2.2.0",
+        "@robdobsn/raftjs": "^2.4.1",
         "@robotical/appv2-analytics-gatherer": "^1.2.17",
         "@robotical/appv2-analytics-types": "^1.2.17",
         "@robotical/appv2-warranty-service-lib": "^1.2.19",
         "@robotical/codewheel": "^0.1.10",
         "@robotical/cog-shooter-game": "^0.1.27",
         "@robotical/jumping-game": "^0.1.29",
-        "@robotical/martyblocks": "^4.0.68",
+        "@robotical/martyblocks": "^4.0.69",
         "@robotical/martyblocksjr": "^4.3.3",
         "@robotical/maze": "^0.1.22",
         "@robotical/rc-sequencer": "^1.1.15",

package/dist-types/src/application/ApplicationManager/ApplicationManager.d.ts

@@ -155,7 +155,7 @@ export default class ApplicationManager {
      * Start looking for rics to connect to
      * This is used from the Phone App only
      */
-    startDiscovery(ricSelectedCb: (raft: RAFT) => void, uuids: string[]): Promise<void>;
+    startDiscovery(ricSelectedCb: (raft: RAFT) => void, uuids: string[], expectedRaftType?: ConnectableRaftType): Promise<void>;
     /**
      * Start discovery without verification
      * This is used from the Phone App only, when the user wants to connect to a RAFT with qr code

package/dist-types/src/application/ApplicationManager/ApplicationManager.js

@@ -97,6 +97,14 @@ var getModalLogoForRaftType = function (raftType) {
     }
     return "none";
 };
+var getDiscoveryRaftType = function (uuids) {
+    var includesMarty = uuids.includes(ConnManager.RICUUID);
+    var includesCog = uuids.includes(ConnManager.COGUUID);
+    if (includesMarty === includesCog) {
+        return undefined;
+    }
+    return includesCog ? RaftTypeE.COG : RaftTypeE.MARTY;
+};
 var ApplicationManager = /** @class */ (function () {
     function ApplicationManager() {
         // locale
@@ -871,7 +879,7 @@ var ApplicationManager = /** @class */ (function () {
                                         return [2 /*return*/];
                                 }
                             });
-                        }); }, uuids)];
+                        }); }, uuids, expectedRaftType)];
                     case 6:
                         _a.sent();
                         _a.label = 7;
@@ -1222,9 +1230,9 @@ var ApplicationManager = /** @class */ (function () {
      * Start looking for rics to connect to
      * This is used from the Phone App only
      */
-    ApplicationManager.prototype.startDiscovery = function (ricSelectedCb, uuids) {
+    ApplicationManager.prototype.startDiscovery = function (ricSelectedCb, uuids, expectedRaftType) {
         return __awaiter(this, void 0, void 0, function () {
-            var wasDiscoveryStarted;
+            var wasDiscoveryStarted, raftType, discoveryTarget;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1232,7 +1240,9 @@ var ApplicationManager = /** @class */ (function () {
                         return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_START_DISCOVERY, { uuids: uuids })];
                     case 1:
                         wasDiscoveryStarted = _a.sent();
-                        return [4 /*yield*/, modalState.setModal(createElement(VerificationModalPhoneApp, { foundRICs: [] }), "Looking for RAFT")];
+                        raftType = expectedRaftType || getDiscoveryRaftType(uuids);
+                        discoveryTarget = raftType || "".concat(RaftTypeE.MARTY, " or ").concat(RaftTypeE.COG);
+                        return [4 /*yield*/, modalState.setModal(createElement(VerificationModalPhoneApp, { foundRICs: [] }), i18n.t("connection.looking_for_raft", { raftType: discoveryTarget }))];
                     case 2:
                         _a.sent();
                         if (!wasDiscoveryStarted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/webapp-types",
-  "version": "3.22.1",
+  "version": "3.22.3",
   "description": "Type definitions for the Application Manager",
   "main": "dist/application-manager.d.ts",
   "types": "dist/application-manager.d.ts",