@robotical/webapp-types 3.17.50 → 3.17.52

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

@@ -7,7 +7,7 @@ import { FOUND_RAFT_ON_DISCOVERY_RESPONSE } from "../../types/phone-app-communic
 import { ColourSensorCalibrationStage } from "../../types/colour-sensor-calibration";
 import { RaftObserver } from "../RAFTs/RaftObserver";
 import { RaftInfoEvents } from "../../types/events/raft-info";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftWifiScanResults, RaftWifiConnStatus, RaftOKFail } from "@robotical/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftWifiScanResults, RaftWifiConnStatus, RaftOKFail } from "@robdobsn/raftjs";
 import { ConnectedRaftItem } from "../../store/SelectedRaftContext";
 import Toaster from "../../utils/Toaster";
 import AnalyticsFacade from "@robotical/appv2-analytics-gatherer";
@@ -23,6 +23,8 @@ export default class ApplicationManager {
     connectedRafts: {
         [key: string]: RAFT;
     };
+    private _connectPromise;
+    private _disconnectPromises;
     connectedRaftsContext: ConnectedRaftItem[];
     returnToMainApp: () => void;
     carouselNavigatorManager: CarouselNavigatorManager;
@@ -54,6 +56,7 @@ export default class ApplicationManager {
     getDeviceInfo(): Promise<void>;
     updateRaftNameInAllStates(raftId: string, name: string): Promise<boolean>;
     private getConnectedRaftName;
+    private isRaftActive;
     private addConnectedRaftToContext;
     private publishLocalVerifiedConnection;
     private confirmQrVerifiedConnection;
@@ -89,6 +92,8 @@ export default class ApplicationManager {
      * Known issue: connecting to a raft from within a platform won't add the newly connected raft to the connectedRafts hook
      */
     connectGeneric(afterRaftConnectedCb: (raft: RAFT) => void, uuids?: string[], shouldShowQrModal?: boolean): Promise<void>;
+    private _clearConnectPromise;
+    private _connectGeneric;
     /**
      * Disconnect from RAFT generic
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
@@ -116,15 +121,13 @@ export default class ApplicationManager {
      */
     disconnectFromRaft(raftId: string): Promise<void>;
     /**
-     * Removes raft from the connectedRafts list after a timeout without disconnecting as at this point
-     * the device should already be disconnected
+     * Finalizes a RAFT which has already emitted its terminal disconnect event.
+     * Passing the source RAFT prevents a late event from deleting a replacement
+     * connection which happens to have the same serial/ID.
      */
-    removeRaft(raftId: string): Promise<void>;
-    /**
-     * Removes raft after a certain time
-     * Removes from the rics list after x seconds so that we can still get the last event
-     */
-    _removeRaft(raftId: string, timeout: number): void;
+    removeRaft(raftId: string, disconnectedRaft?: RAFT): Promise<void>;
+    private _disconnectRaft;
+    private _removeRaftIfCurrent;
     /**
      * Start looking for rics to connect to
      * This is used from the Phone App only
@@ -143,7 +146,7 @@ export default class ApplicationManager {
     /**
      * Stop verifying raft
      */
-    stopVerifyingRaft(raftId: string, isCorrectRIC: boolean): Promise<void>;
+    stopVerifyingRaft(raftId: string, isCorrectRIC: boolean): Promise<boolean | undefined>;
     /**
      * Publishing events to observers
      * It could be either events we get from RAFT, or custom events related to the app

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

@@ -45,7 +45,7 @@ import VerificationModal from "../../components/modals/VerificationModal";
 import { raftFoundSubscriptionHelper } from "../RAFTs/raft-subscription-helpers";
 import { AppSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 import VerificationModalPhoneApp from "../../components/modals/VerificationModalPhoneApp";
-import { RaftConnEvent, } from "@robotical/raftjs";
+import { RaftConnEvent, } from "@robdobsn/raftjs";
 import Logger from "../../services/logger/Logger";
 import isPhoneApp from "../../utils/phone-app-communication/is-phone-app";
 import DisconnectConfirmationModal from "../../components/modals/DisconnectConfirmation";
@@ -90,6 +90,8 @@ var ApplicationManager = /** @class */ (function () {
         this._observers = {};
         // Connected RICs
         this.connectedRafts = {};
+        this._connectPromise = null;
+        this._disconnectPromises = new Map();
         this.connectedRaftsContext = [];
         this.returnToMainApp = function () { };
         // Carousel navigators
@@ -226,6 +228,9 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
+    ApplicationManager.prototype.isRaftActive = function (raft) {
+        return this.connectedRafts[raft.id] === raft && !this._disconnectPromises.has(raft);
+    };
     ApplicationManager.prototype.addConnectedRaftToContext = function (raft) {
         return __awaiter(this, void 0, void 0, function () {
             var name;
@@ -234,13 +239,16 @@ var ApplicationManager = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.getConnectedRaftName(raft)];
                     case 1:
                         name = _a.sent();
+                        if (!this.isRaftActive(raft)) {
+                            return [2 /*return*/, false];
+                        }
                         this.connectedRaftContextMethods.addConnectedRaft({
                             id: raft.id,
                             type: raft.type,
                             name: name,
                             isSelected: true,
                         });
-                        return [2 /*return*/];
+                        return [2 /*return*/, true];
                 }
             });
         });
@@ -489,18 +497,10 @@ var ApplicationManager = /** @class */ (function () {
         return new Marty(id);
     };
     ApplicationManager.prototype.connectGenericMarty = function (afterRaftConnectedCb) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false)];
-            });
-        });
+        return this.connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false);
     };
     ApplicationManager.prototype.connectGenericCog = function (afterRaftConnectedCb) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.connectGeneric(afterRaftConnectedCb, [ConnManager.COGUUID])];
-            });
-        });
+        return this.connectGeneric(afterRaftConnectedCb, [ConnManager.COGUUID]);
     };
     /**
      * Generic Connect method
@@ -508,9 +508,31 @@ var ApplicationManager = /** @class */ (function () {
      * Known issue: connecting to a raft from within a platform won't add the newly connected raft to the connectedRafts hook
      */
     ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal) {
+        var _this = this;
+        if (shouldShowQrModal === void 0) { shouldShowQrModal = true; }
+        if (this._connectPromise) {
+            return this._connectPromise;
+        }
+        if (this._disconnectPromises.size > 0) {
+            this.toaster.info(i18n.t("connection.wait_for_bluetooth_disconnect", {
+                defaultValue: "Please wait for the current Bluetooth disconnect to finish.",
+            }));
+            return Promise.resolve();
+        }
+        var connectPromise = this._connectGeneric(afterRaftConnectedCb, uuids, shouldShowQrModal);
+        this._connectPromise = connectPromise;
+        void connectPromise.then(function () { return _this._clearConnectPromise(connectPromise); }, function () { return _this._clearConnectPromise(connectPromise); });
+        return connectPromise;
+    };
+    ApplicationManager.prototype._clearConnectPromise = function (connectPromise) {
+        if (this._connectPromise === connectPromise) {
+            this._connectPromise = null;
+        }
+    };
+    ApplicationManager.prototype._connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal) {
         if (shouldShowQrModal === void 0) { shouldShowQrModal = true; }
         return __awaiter(this, void 0, void 0, function () {
-            var verificationMethod, cancelVerificationResult, isQRVerification, e_1, newRaft, e_2;
+            var verificationMethod, cancelVerificationResult, isQRVerification, e_1, newRaft, wasAdopted, e_2;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -537,7 +559,7 @@ var ApplicationManager = /** @class */ (function () {
                             return [2 /*return*/];
                         }
                         if (verificationMethod.action === "switch-to-marty") {
-                            return [2 /*return*/, this.connectGenericMarty(afterRaftConnectedCb)];
+                            return [2 /*return*/, this._connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false)];
                         }
                         isQRVerification = false;
                         if (verificationMethod.action === "qr") {
@@ -562,12 +584,15 @@ var ApplicationManager = /** @class */ (function () {
                         _a.sent();
                         return [3 /*break*/, 7];
                     case 5: return [4 /*yield*/, window.applicationManager.startDiscovery(function (newRaft) { return __awaiter(_this, void 0, void 0, function () {
+                            var wasAdopted;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0: return [4 /*yield*/, this.addConnectedRaftToContext(newRaft)];
                                     case 1:
-                                        _a.sent();
-                                        afterRaftConnectedCb(newRaft);
+                                        wasAdopted = _a.sent();
+                                        if (wasAdopted && this.isRaftActive(newRaft)) {
+                                            afterRaftConnectedCb(newRaft);
+                                        }
                                         return [2 /*return*/];
                                 }
                             });
@@ -592,9 +617,11 @@ var ApplicationManager = /** @class */ (function () {
                         if (!newRaft) return [3 /*break*/, 15];
                         return [4 /*yield*/, this.addConnectedRaftToContext(newRaft)];
                     case 13:
-                        _a.sent();
-                        afterRaftConnectedCb(newRaft);
-                        if (!isQRVerification) return [3 /*break*/, 15];
+                        wasAdopted = _a.sent();
+                        if (wasAdopted && this.isRaftActive(newRaft)) {
+                            afterRaftConnectedCb(newRaft);
+                        }
+                        if (!(wasAdopted && this.isRaftActive(newRaft) && isQRVerification)) return [3 /*break*/, 15];
                         return [4 /*yield*/, this.confirmQrVerifiedConnection(newRaft)];
                     case 14:
                         _a.sent();
@@ -623,27 +650,32 @@ var ApplicationManager = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 4, , 5]);
-                        if (!!skipConfirmation) return [3 /*break*/, 2];
-                        return [4 /*yield*/, modalState.setModal(createElement(DisconnectConfirmationModal), "Are you sure you want to disconnect from your ".concat(raft.getFriendlyName(), "?"), getModalLogoForRaftType(raft.type))];
+                        if (!raft) {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
                     case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        if (!!skipConfirmation) return [3 /*break*/, 3];
+                        return [4 /*yield*/, modalState.setModal(createElement(DisconnectConfirmationModal), "Are you sure you want to disconnect from your ".concat(raft.getFriendlyName(), "?"), getModalLogoForRaftType(raft.type))];
+                    case 2:
                         confirmDisconnect = _a.sent();
                         if (!confirmDisconnect) {
                             return [2 /*return*/];
                         }
-                        _a.label = 2;
-                    case 2: return [4 /*yield*/, window.applicationManager.disconnectFromRaft(raft.id)];
-                    case 3:
+                        _a.label = 3;
+                    case 3: return [4 /*yield*/, window.applicationManager.disconnectFromRaft(raft.id)];
+                    case 4:
                         _a.sent();
                         if (afterRaftDisconnectedCb) {
                             afterRaftDisconnectedCb();
                         }
-                        return [3 /*break*/, 5];
-                    case 4:
+                        return [3 /*break*/, 6];
+                    case 5:
                         e_3 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to disconnect from robot: ".concat(e_3));
-                        return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -788,59 +820,78 @@ var ApplicationManager = /** @class */ (function () {
      * Disconnect from RAFT
      */
     ApplicationManager.prototype.disconnectFromRaft = function (raftId) {
+        var raft = this.connectedRafts[raftId];
+        if (!raft) {
+            return Promise.resolve();
+        }
+        return this._disconnectRaft(raft);
+    };
+    /**
+     * Finalizes a RAFT which has already emitted its terminal disconnect event.
+     * Passing the source RAFT prevents a late event from deleting a replacement
+     * connection which happens to have the same serial/ID.
+     */
+    ApplicationManager.prototype.removeRaft = function (raftId, disconnectedRaft) {
         return __awaiter(this, void 0, void 0, function () {
-            var raft;
+            var currentRaft;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.connectedRaftContextMethods.removeConnectedRaft(raftId);
-                        raft = this.connectedRafts[raftId];
-                        if (!raft) {
-                            return [2 /*return*/];
-                        }
-                        return [4 /*yield*/, raft.disconnect()];
-                    case 1:
-                        _a.sent();
-                        this._removeRaft(raftId, 3000);
-                        return [2 /*return*/];
+                currentRaft = this.connectedRafts[raftId];
+                if (!currentRaft || (disconnectedRaft && currentRaft !== disconnectedRaft)) {
+                    return [2 /*return*/];
+                }
+                // A user-initiated disconnect is already waiting for RAFT_DISCONNECT.
+                // The event is only a notification in that case, not a second command.
+                if (this._disconnectPromises.has(currentRaft)) {
+                    return [2 /*return*/];
                 }
+                this._removeRaftIfCurrent(currentRaft);
+                return [2 /*return*/];
             });
         });
     };
-    /**
-     * Removes raft from the connectedRafts list after a timeout without disconnecting as at this point
-     * the device should already be disconnected
-     */
-    ApplicationManager.prototype.removeRaft = function (raftId) {
-        return __awaiter(this, void 0, void 0, function () {
-            var raft;
+    ApplicationManager.prototype._disconnectRaft = function (raft, beforeDisconnect) {
+        var _this = this;
+        var inFlightDisconnect = this._disconnectPromises.get(raft);
+        if (inFlightDisconnect) {
+            return inFlightDisconnect;
+        }
+        var operation = Promise.resolve().then(function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.connectedRaftContextMethods.removeConnectedRaft(raftId);
-                        raft = this.connectedRafts[raftId];
-                        if (!raft) {
-                            return [2 /*return*/];
-                        }
-                        return [4 /*yield*/, raft.disconnect()];
+                        _a.trys.push([0, , 3, 5]);
+                        if (!beforeDisconnect) return [3 /*break*/, 2];
+                        return [4 /*yield*/, beforeDisconnect()];
                     case 1:
                         _a.sent();
-                        this._removeRaft(raftId, 10);
-                        return [2 /*return*/];
+                        _a.label = 2;
+                    case 2: return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, raft.disconnect()];
+                    case 4:
+                        _a.sent();
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
                 }
             });
+        }); });
+        var disconnectPromise;
+        disconnectPromise = operation.finally(function () {
+            _this._removeRaftIfCurrent(raft);
+            if (_this._disconnectPromises.get(raft) === disconnectPromise) {
+                _this._disconnectPromises.delete(raft);
+            }
         });
+        // Register ownership before connector code runs. A connector may emit a
+        // terminal event synchronously while disconnect() is being invoked.
+        this._disconnectPromises.set(raft, disconnectPromise);
+        return disconnectPromise;
     };
-    /**
-     * Removes raft after a certain time
-     * Removes from the rics list after x seconds so that we can still get the last event
-     */
-    ApplicationManager.prototype._removeRaft = function (raftId, timeout) {
-        var _this = this;
-        var ricRemovalTimeout = setTimeout(function () {
-            delete _this.connectedRafts[raftId];
-            clearTimeout(ricRemovalTimeout);
-        }, timeout);
+    ApplicationManager.prototype._removeRaftIfCurrent = function (raft) {
+        if (this.connectedRafts[raft.id] !== raft) {
+            return;
+        }
+        delete this.connectedRafts[raft.id];
+        this.connectedRaftContextMethods.removeConnectedRaft(raft.id);
     };
     /**
      * Start looking for rics to connect to
@@ -892,7 +943,7 @@ var ApplicationManager = /** @class */ (function () {
                         raftFoundSubscriptionHelper().subscribe(function (_a) {
                             var discoveredDevice = _a.discoveredDevice;
                             return __awaiter(_this, void 0, void 0, function () {
-                                var newRaft, oldColours;
+                                var newRaft, wasAdopted, oldColours;
                                 return __generator(this, function (_b) {
                                     switch (_b.label) {
                                         case 0:
@@ -909,7 +960,10 @@ var ApplicationManager = /** @class */ (function () {
                                             secondaryModalState.closeModalWithoutAnimation();
                                             return [4 /*yield*/, this.addConnectedRaftToContext(newRaft)];
                                         case 2:
-                                            _b.sent();
+                                            wasAdopted = _b.sent();
+                                            if (!wasAdopted || !this.isRaftActive(newRaft)) {
+                                                return [2 /*return*/];
+                                            }
                                             afterRaftConnectedCb(newRaft);
                                             oldColours = newRaft._ledLcdColours;
                                             newRaft._ledLcdColours = [];
@@ -967,15 +1021,32 @@ var ApplicationManager = /** @class */ (function () {
      * Stop verifying raft
      */
     ApplicationManager.prototype.stopVerifyingRaft = function (raftId, isCorrectRIC) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, ((_a = this.connectedRafts[raftId]) === null || _a === void 0 ? void 0 : _a.stopVerifyingRaft(isCorrectRIC))];
+            var raft, verificationResult;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        raft = this.connectedRafts[raftId];
+                        if (!raft) {
+                            return [2 /*return*/];
+                        }
+                        if (isCorrectRIC) {
+                            return [2 /*return*/, raft.stopVerifyingRaft(true)];
+                        }
+                        return [4 /*yield*/, this._disconnectRaft(raft, function () { return __awaiter(_this, void 0, void 0, function () {
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, raft.stopVerifyingRaft(false)];
+                                        case 1:
+                                            verificationResult = _a.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
                     case 1:
-                        _b.sent();
-                        this._removeRaft(raftId, 3000);
-                        return [2 /*return*/];
+                        _a.sent();
+                        return [2 /*return*/, verificationResult];
                 }
             });
         });

package/dist-types/src/application/RAFTs/Cog/Cog.d.ts

@@ -3,7 +3,7 @@ import RICInterface from "../RAFTInterface";
 import { RaftTypeE } from "../../../types/raft";
 import { RICLedLcdColours } from "@robotical/roboticaljs";
 import { SimplifiedCogStateInfo } from "@robotical/roboticaljs/dist/SystemTypeCog/CogTypes";
-import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
 import PublishedDataAnalyser from "./PublishedDataAnalyser";
 export declare class Cog extends RAFT implements RICInterface {

package/dist-types/src/application/RAFTs/Cog/Cog.js

@@ -51,7 +51,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import RAFT from "../RAFT";
 import { RaftTypeE } from "../../../types/raft";
-import { RaftConnEvent, RaftPublishEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftPublishEvent } from "@robdobsn/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
 import PublishedDataAnalyser, { setButtonThresholdsUtil } from "./PublishedDataAnalyser";
 var Cog = /** @class */ (function (_super) {

package/dist-types/src/application/RAFTs/Marty/CalibrationManager.d.ts

@@ -1,4 +1,4 @@
-import { RaftOKFail } from "@robotical/raftjs";
+import { RaftOKFail } from "@robdobsn/raftjs";
 import Marty from "./Marty";
 export default class CalibrationManager {
     marty: Marty;

package/dist-types/src/application/RAFTs/Marty/CalibrationManager.js

@@ -34,7 +34,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { RaftOKFail } from "@robotical/raftjs";
+import { RaftOKFail } from "@robdobsn/raftjs";
 import Logger from "../../../services/logger/Logger";
 var SHOW_LOGS = true;
 var TAG = "CalibrationManager";

package/dist-types/src/application/RAFTs/Marty/Marty.d.ts

@@ -1,7 +1,7 @@
 import RICInterface from "../RAFTInterface";
 import { RaftTypeE } from "../../../types/raft";
 import RAFT from "../RAFT";
-import { RaftConnEvent, RaftPublishEvent, RaftSystemInfo, RaftUpdateEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftSystemInfo, RaftUpdateEvent } from "@robdobsn/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
 import { RICLedLcdColours, RICStateInfo } from "@robotical/roboticaljs";
 import { MartyWifiManager } from "./MartyWifiManager";

package/dist-types/src/application/RAFTs/Marty/Marty.js

@@ -51,7 +51,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { RaftTypeE } from "../../../types/raft";
 import RAFT from "../RAFT";
-import { RaftConnEvent, RaftPublishEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftPublishEvent } from "@robdobsn/raftjs";
 import { MartyWifiManager } from "./MartyWifiManager";
 import MartyAddonsManager from "./MartyAddonsManager";
 import CalibrationManager from "./CalibrationManager";

package/dist-types/src/application/RAFTs/Marty/MartyWifiManager.d.ts

@@ -1,4 +1,4 @@
-import { RaftOKFail, RaftWifiConnStatus, RaftWifiScanResults } from "@robotical/raftjs";
+import { RaftOKFail, RaftWifiConnStatus, RaftWifiScanResults } from "@robdobsn/raftjs";
 import Marty from "./Marty";
 export declare class MartyWifiManager {
     marty: Marty;

package/dist-types/src/application/RAFTs/Marty/MartyWifiManager.js

@@ -34,7 +34,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { RaftWifiConnState, RaftWifiConnStatus } from "@robotical/raftjs";
+import { RaftWifiConnState, RaftWifiConnStatus } from "@robdobsn/raftjs";
 import Logger from "../../../services/logger/Logger";
 var SHOW_LOGS = true;
 var TAG = "MartyWifiManager";

package/dist-types/src/application/RAFTs/Marty/notifications-manager/ReportedWarningsState.js

@@ -3,7 +3,7 @@
  * One of the main purposes of this class is to prevent duplicate warnings from being
  * displayed to the user.
  */
-import { RaftLog } from "@robotical/raftjs";
+import { RaftLog } from "@robdobsn/raftjs";
 // we won't store these warnings in the cached warnings state, and so they won't be displayed or stored to the warranty service db, only to the general db
 var ERRORS_TO_IGNORE = [
     // eyes faulty connection 

package/dist-types/src/application/RAFTs/RAFT.d.ts

@@ -4,7 +4,7 @@ import { RaftInfoEvents } from "../../types/events/raft-info";
 import { FOUND_RAFT_ON_DISCOVERY_RESPONSE } from "../../types/phone-app-communicator";
 import RICInterface from "./RAFTInterface";
 import { RaftObserver } from "./RaftObserver";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftOKFail, RaftSystemInfo } from "@robotical/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftOKFail, RaftSystemInfo } from "@robdobsn/raftjs";
 import { RICLedLcdColours, RICStateInfo } from "@robotical/roboticaljs";
 import { SimplifiedCogStateInfo } from "@robotical/roboticaljs/dist/SystemTypeCog/CogTypes";
 export default class RAFT implements RICInterface {

package/dist-types/src/application/RAFTs/RAFT.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { AppSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 import { RaftTypeE } from "../../types/raft";
 import { RaftInfoEvents } from "../../types/events/raft-info";
-import { RaftConnEvent, RaftPublishEvent, } from "@robotical/raftjs";
+import { RaftConnEvent, RaftPublishEvent, } from "@robdobsn/raftjs";
 import Logger from "../../services/logger/Logger";
 import randomHashGenerator from "../../utils/helpers/randomHashGenerator";
 import { addRobotNameToSerialNumber, isSerialNumberRegistered } from "../../utils/warranty-service/warranty-service-utils";
@@ -400,7 +400,7 @@ var RAFT = /** @class */ (function () {
                     // this runs when the RAFT is disconnected either on its own (due to a timeout or other reasons), or by the user
                     // if it's by the user, we don't really need to do anything as the applicationManager will handle the disconnection
                     // if the RAFT is disconnected on its own, however, we need to remove it from the connectedRafts list
-                    return [4 /*yield*/, window.applicationManager.removeRaft(this.id)];
+                    return [4 /*yield*/, window.applicationManager.removeRaft(this.id, this)];
                     case 3:
                         // this runs when the RAFT is disconnected either on its own (due to a timeout or other reasons), or by the user
                         // if it's by the user, we don't really need to do anything as the applicationManager will handle the disconnection

package/dist-types/src/application/RAFTs/RAFTInterface.d.ts

@@ -1,5 +1,5 @@
 import { RaftTypeE } from "../../types/raft";
-import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
 import { RaftInfoEvents } from "../../types/events/raft-info";
 import { RICLedLcdColours } from "@robotical/roboticaljs";
 export default abstract class RICInterface {

package/dist-types/src/application/RAFTs/RaftObserver.d.ts

@@ -1,5 +1,5 @@
 import { RaftInfoEvents } from "../../types/events/raft-info";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robdobsn/raftjs";
 export interface MartyObservable {
     subscribe(observer: RaftObserver, topics: Array<string>): void;
     unsubscribe(observer: RaftObserver): void;

package/dist-types/src/application/RAFTs/raft-subscription-helpers.js

@@ -1,4 +1,4 @@
-import { RaftConnEvent } from "@robotical/raftjs";
+import { RaftConnEvent } from "@robdobsn/raftjs";
 var subHelpersObject = {};
 /**
  * Connection Verifying Subscription Helper

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

@@ -156,8 +156,7 @@ function QRContent(_a) {
                     "linear_codes",
                     "upc_a",
                     "upc_e",
-                ], allowMultiple: false, scanDelay: 2000, onScan: onQrCodeFound, components: {
-                    audio: true,
+                ], allowMultiple: false, scanDelay: 2000, sound: true, onScan: onQrCodeFound, components: {
                     onOff: false,
                     torch: true,
                     zoom: true,

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

@@ -55,17 +55,13 @@ import RICSignal from "../../oneoffs/RaftSignal";
 import SimpleButton from "../../disposables/buttons/SimpleButton";
 import LEDs from "../../oneoffs/LEDs";
 import { raftConnectingSubscriptionHelper } from "../../../application/RAFTs/raft-subscription-helpers";
-import { useConnectedRafts } from "../../../store/SelectedRaftContext";
 import { useTranslation } from "react-i18next";
-var SHOW_LOGS = true;
-var TAG = "VerificationModal";
 function VerificationModal(_a) {
     var _this = this;
     var connectedRAFT_ = _a.connectedRAFT_;
     var _b = useState([]), randomColours = _b[0], setRandomColours = _b[1];
     // const [connectedRaft, setConnectedRaft] = useState<RAFT | undefined>(connectedRAFT_);
     var _c = useState(-200), RSSI = _c[0], setRSSI = _c[1];
-    var removeConnectedRaft = useConnectedRafts().removeConnectedRaft;
     var t = useTranslation().t;
     useEffect(function () {
         /* Subscribe to the connectedRaft's SIGNAL strength */
@@ -84,12 +80,8 @@ function VerificationModal(_a) {
                     modalState.closeModal();
                     if (!connectedRAFT_)
                         return [2 /*return*/];
-                    removeConnectedRaft(connectedRAFT_.id);
                     return [4 /*yield*/, window.applicationManager.stopVerifyingRaft(connectedRAFT_.id, false)];
                 case 1:
-                    _a.sent();
-                    return [4 /*yield*/, connectedRAFT_.disconnect()];
-                case 2:
                     _a.sent();
                     return [2 /*return*/];
             }