@robotical/webapp-types 3.11.4 → 3.11.6

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

@@ -26,6 +26,7 @@ export default class ApplicationManager {
     carouselNavigatorManager: CarouselNavigatorManager;
     deviceInfo: UserDeviceInfo | undefined;
     userRoleCtx: UserRoleContextTypes | null;
+    lastUUIDsUsed: string[] | null;
     setUserRoleCtx(userRoleCtx: UserRoleContextTypes): void;
     private _router;
     setRouter(router: any): void;

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

@@ -74,6 +74,7 @@ var ApplicationManager = /** @class */ (function () {
         this.deviceInfo = undefined;
         // User role context
         this.userRoleCtx = null;
+        this.lastUUIDsUsed = null;
         // Callback to call when a RAFT is selected (Phone App only)
         // We need that to make sure the connection button gets the selected RAFT once the user selects one
         this.ricSelectedCb = null;
@@ -413,6 +414,7 @@ var ApplicationManager = /** @class */ (function () {
                             }
                         }
                         if (!isPhoneApp()) return [3 /*break*/, 11];
+                        this.lastUUIDsUsed = uuids; // Store the last used UUIDs so when the user presses "Scan Again" in the phone app connection modal, we can use them to start discovery again
                         _a.label = 4;
                     case 4:
                         _a.trys.push([4, 9, , 10]);
@@ -711,28 +713,35 @@ var ApplicationManager = /** @class */ (function () {
                                             if (foundRICs.length > 0) {
                                                 return [2 /*return*/];
                                             }
-                                            if (!discoveredDevice._serviceUUIDs.includes(uuids[0])) return [3 /*break*/, 4];
+                                            if (!discoveredDevice._serviceUUIDs.includes(uuids[0])) return [3 /*break*/, 7];
                                             foundRICs.push(discoveredDevice);
                                             return [4 /*yield*/, this.selectRaft(discoveredDevice, RaftConnectionMethod.PHONE_BLE)];
                                         case 1:
                                             newRaft = _b.sent();
-                                            if (!newRaft) return [3 /*break*/, 3];
+                                            if (!newRaft) return [3 /*break*/, 6];
                                             secondaryModalState.closeModal();
                                             this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                                             afterRaftConnectedCb(newRaft);
                                             oldColours = newRaft._ledLcdColours;
                                             newRaft._ledLcdColours = [];
-                                            return [4 /*yield*/, newRaft.verifyRaft()];
+                                            if (!isPhoneApp()) return [3 /*break*/, 3];
+                                            return [4 /*yield*/, newRaft.verifyRaftPhoneApp(discoveredDevice)];
                                         case 2:
                                             _b.sent();
+                                            return [3 /*break*/, 5];
+                                        case 3: return [4 /*yield*/, newRaft.verifyRaft()];
+                                        case 4:
+                                            _b.sent();
+                                            _b.label = 5;
+                                        case 5:
                                             newRaft._ledLcdColours = oldColours;
                                             newRaft.stopVerifyingRaft(true);
                                             raftFoundSubscriptionHelper().unsubscribe();
-                                            return [3 /*break*/, 4];
-                                        case 3:
+                                            return [3 /*break*/, 7];
+                                        case 6:
                                             foundRICs = [];
-                                            _b.label = 4;
-                                        case 4: return [2 /*return*/];
+                                            _b.label = 7;
+                                        case 7: return [2 /*return*/];
                                     }
                                 });
                             });

package/dist-types/src/components/modals/ConnectingLoadingSpinnerModal/index.js

@@ -10,7 +10,15 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from "react";
+import { secondaryModalState } from "../../../state-observables/modal/ModalState";
 import styles from "./styles.module.css";
 export default function ConnectingLoadingSpinnerModal(_a) {
+    useEffect(function () {
+        // close modal after 3 minutes assuming no connection will take that long
+        setTimeout(function () {
+            secondaryModalState.closeModal();
+        }, 180000);
+    }, []);
     return (_jsx("div", __assign({ className: styles.container }, { children: "This shouldn't take long!" })));
 }

package/dist-types/src/components/modals/VerificationModalPhoneApp/index.js

@@ -147,7 +147,7 @@ function VerificationModalPhoneApp(_a) {
                     setSelectedRICIdx(-1);
                     setConnectedRaft(undefined);
                     if (!window.applicationManager.ricSelectedCb) return [3 /*break*/, 5];
-                    return [4 /*yield*/, window.applicationManager.startDiscovery(window.applicationManager.ricSelectedCb, [ConnManager.COGUUID, ConnManager.RICUUID])];
+                    return [4 /*yield*/, window.applicationManager.startDiscovery(window.applicationManager.ricSelectedCb, window.applicationManager.lastUUIDsUsed ? window.applicationManager.lastUUIDsUsed : [ConnManager.COGUUID, ConnManager.RICUUID])];
                 case 4:
                     _a.sent();
                     _a.label = 5;

package/package.json

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