@robotical/webapp-types 3.16.26 → 3.16.28

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

@@ -60,6 +60,20 @@ import i18n from "../../i18n";
 import InUnpluggedModalContent from "../../components/modals/InUnplugged";
 var SHOW_LOGS = true;
 var TAG = "ApplicationManager";
+var UNSUPPORTED_WEB_BLUETOOTH_BROWSER_MESSAGE = "This browser can't connect to Marty or Cog over Bluetooth. Please use Chrome or Edge, or use the iPad app.";
+var canUseWebBluetooth = function () {
+    var bluetooth = navigator.bluetooth;
+    return window.isSecureContext && !!bluetooth && typeof bluetooth.requestDevice === "function";
+};
+var getModalLogoForRaftType = function (raftType) {
+    if (raftType === RaftTypeE.COG) {
+        return "cog";
+    }
+    if (raftType === RaftTypeE.MARTY) {
+        return "marty";
+    }
+    return "none";
+};
 var ApplicationManager = /** @class */ (function () {
     function ApplicationManager() {
         // locale
@@ -408,17 +422,24 @@ var ApplicationManager = /** @class */ (function () {
     ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal) {
         if (shouldShowQrModal === void 0) { shouldShowQrModal = true; }
         return __awaiter(this, void 0, void 0, function () {
-            var verificationMethod, isQRVerification, e_1, newRaft, e_2;
+            var verificationMethod, cancelVerificationResult, isQRVerification, e_1, newRaft, e_2;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (!isPhoneApp() && !canUseWebBluetooth()) {
+                            this.toaster.error(i18n.t("connection.unsupported_web_bluetooth_browser", {
+                                defaultValue: UNSUPPORTED_WEB_BLUETOOTH_BROWSER_MESSAGE,
+                            }), { autoClose: false });
+                            return [2 /*return*/];
+                        }
                         verificationMethod = { action: "led" };
                         if (!shouldShowQrModal) return [3 /*break*/, 2];
+                        cancelVerificationResult = { action: "cancel" };
                         return [4 /*yield*/, modalState.setModal(createElement(LEDLightsOrQRVerificationModal, {
                                 targetRaftType: RaftTypeE.COG,
                                 allowSwitchToMarty: true,
-                            }), i18n.t("connection.verification_method"))];
+                            }), i18n.t("connection.verification_method"), true, true, cancelVerificationResult)];
                     case 1:
                         verificationMethod =
                             (_a.sent()) || { action: "cancel" };
@@ -503,7 +524,7 @@ var ApplicationManager = /** @class */ (function () {
                     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(), "?"))];
+                        return [4 /*yield*/, modalState.setModal(createElement(DisconnectConfirmationModal), "Are you sure you want to disconnect from your ".concat(raft.getFriendlyName(), "?"), getModalLogoForRaftType(raft.type))];
                     case 1:
                         confirmDisconnect = _a.sent();
                         if (!confirmDisconnect) {
@@ -758,7 +779,7 @@ var ApplicationManager = /** @class */ (function () {
                         foundRICs = [];
                         notFoundTimeout = setTimeout(function () {
                             if (foundRICs.length === 0) {
-                                _this.toaster.error("Make sure the robot is powered on and in range!");
+                                _this.toaster.error("Make sure the device is powered on and in range!");
                             }
                             window.applicationManager.stopDiscovery();
                             secondaryModalState.closeModalWithoutAnimation();

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

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import modalState from "../../../state-observables/modal/ModalState";
 import { RED } from "../../../styles/colors";
 import SimpleButton from "../../disposables/buttons/SimpleButton";
-import { Container } from "./styles";
+import { ButtonRow, Container } from "./styles";
 export default function DisconnectConfirmationModal() {
-    return (_jsxs(Container, { children: [_jsx(SimpleButton, { onClick: function () { return modalState.closeModal(false); }, title: "Cancel" }), _jsx(SimpleButton, { onClick: function () { return modalState.closeModal(true); }, title: "Disconnect", colour: RED })] }));
+    return (_jsx(Container, { children: _jsxs(ButtonRow, { children: [_jsx(SimpleButton, { onClick: function () { return modalState.closeModal(false); }, title: "Cancel" }), _jsx(SimpleButton, { onClick: function () { return modalState.closeModal(true); }, title: "Disconnect", colour: RED })] }) }));
 }

package/dist-types/src/components/modals/DisconnectConfirmation/styles.d.ts

@@ -1 +1,2 @@
 export declare const Container: import("styled-components").StyledComponent<"div", any, {}, never>;
+export declare const ButtonRow: import("styled-components").StyledComponent<"div", any, {}, never>;

package/dist-types/src/components/modals/DisconnectConfirmation/styles.js

@@ -3,5 +3,6 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
     return cooked;
 };
 import styled from "styled-components";
-export var Container = styled.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    display: grid;\n    grid-auto-flow: column;\n    column-gap: 2rem;\n"], ["\n    display: grid;\n    grid-auto-flow: column;\n    column-gap: 2rem;\n"])));
-var templateObject_1;
+export var Container = styled.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    display: grid;\n    justify-items: center;\n    row-gap: 1.5rem;\n"], ["\n    display: grid;\n    justify-items: center;\n    row-gap: 1.5rem;\n"])));
+export var ButtonRow = styled.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n    display: grid;\n    grid-auto-flow: column;\n    column-gap: 2rem;\n    width: 100%;\n\n    @media (max-width: 480px) {\n        grid-auto-flow: row;\n        row-gap: 1rem;\n    }\n"], ["\n    display: grid;\n    grid-auto-flow: column;\n    column-gap: 2rem;\n    width: 100%;\n\n    @media (max-width: 480px) {\n        grid-auto-flow: row;\n        row-gap: 1rem;\n    }\n"])));
+var templateObject_1, templateObject_2;

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

@@ -16,6 +16,6 @@ function InBtButAPressedModalContent() {
             modalState.closeModal();
         }, 1000);
     };
-    return (_jsxs(StyledView, { children: [_jsx(ModalTitle, { children: modalText }), modalText !== "Disconnected!" && (_jsx(ModalText, { children: "Someone has pressed the \"MODE\"/\"A\" button on the robot, if you would like to change mode you must first disconnect from the app and then press the A again!" })), _jsx(StyledImage, { src: imageAbutton }), modalText !== "Disconnected!" && (_jsxs(ButtonsView, { children: [_jsx(SimpleButton, { title: "Cancel", onClick: function () { return modalState.closeModal(); } }), _jsx(SimpleButton, { title: "Disconnect", onClick: disconnectHandler })] }))] }));
+    return (_jsxs(StyledView, { children: [_jsx(ModalTitle, { children: modalText }), modalText !== "Disconnected!" && (_jsx(ModalText, { children: "Someone has pressed the \"MODE\"/\"A\" button on Marty, if you would like to change mode you must first disconnect from the app and then press the A again!" })), _jsx(StyledImage, { src: imageAbutton }), modalText !== "Disconnected!" && (_jsxs(ButtonsView, { children: [_jsx(SimpleButton, { title: "Cancel", onClick: function () { return modalState.closeModal(); } }), _jsx(SimpleButton, { title: "Disconnect", onClick: disconnectHandler })] }))] }));
 }
 export default InBtButAPressedModalContent;

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

@@ -64,6 +64,7 @@ export default function LEDLightsOrQRVerificationModal(_a) {
     var _c = useState(true), qrSelected = _c[0], setQRSelected = _c[1];
     var _d = useState(undefined), serialNoFromQR = _d[0], setSerialNoFromQR = _d[1];
     var _e = useState(false), isButtonToConnectVisible = _e[0], setIsButtonToConnectVisible = _e[1];
+    var cancelResult = { action: "cancel" };
     useEffect(function () {
         if (serialNoFromQR) {
             setIsButtonToConnectVisible(true);
@@ -112,7 +113,7 @@ export default function LEDLightsOrQRVerificationModal(_a) {
                             var id = _a.id, title = _a.title, subtitle = _a.subtitle, icon = _a.icon;
                             return (_jsxs("button", __assign({ type: "button", className: qrSelected && id === 'qr' ? [styles.card, styles.qrselected].join(" ") : styles.card, onClick: function () { return handleSelect(id); }, "aria-label": title, "aria-pressed": id === "qr" ? qrSelected : false }, { children: [_jsx("div", __assign({ className: styles.icon }, { children: icon })), _jsx("h3", __assign({ className: styles.title }, { children: title })), _jsx("p", __assign({ className: styles.subtitle }, { children: subtitle }))] }), id));
                         }) })) :
-                        _jsx("div", __assign({ className: styles.cogNote }, { children: _jsxs("strong", { children: ["Don't forget to ", _jsx("span", __assign({ className: styles.cogNoteHighlight }, { children: "turn on" })), " your Cog!"] }) }))] }), qrSelected && _jsx(QRContent, { setSerialNo: setSerialNoFromQR }), _jsxs("div", __assign({ className: styles.buttonsContainer }, { children: [isButtonToConnectVisible && _jsx("button", __assign({ type: "button", className: styles.connectButton, onClick: handleConnect }, { children: t('connection.qr_connect_button') })), _jsx("button", __assign({ type: "button", className: styles.cancelButton, onClick: function () { return modalState.closeModal({ action: "cancel" }); } }, { children: t('connection.cancel') }))] }))] })));
+                        _jsx("div", __assign({ className: styles.cogNote }, { children: _jsxs("strong", { children: ["Don't forget to ", _jsx("span", __assign({ className: styles.cogNoteHighlight }, { children: "turn on" })), " your Cog!"] }) }))] }), qrSelected && _jsx(QRContent, { setSerialNo: setSerialNoFromQR }), _jsxs("div", __assign({ className: styles.buttonsContainer }, { children: [isButtonToConnectVisible && _jsx("button", __assign({ type: "button", className: styles.connectButton, onClick: handleConnect }, { children: t('connection.qr_connect_button') })), _jsx("button", __assign({ type: "button", className: styles.cancelButton, onClick: function () { return modalState.closeModal(cancelResult); } }, { children: t('connection.cancel') }))] }))] })));
 }
 function QRContent(_a) {
     var _this = this;

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

@@ -215,11 +215,11 @@ function VerificationModalPhoneApp(_a) {
     }); };
     var contentJSX = null;
     if (foundRICsState.length === 0) {
-        contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [!isScanning && _jsx("p", __assign({ style: { alignSelf: 'center' } }, { children: t("verification_modal_phone.no_robots_found", "No Robots Found") })), _jsx("div", __assign({ className: "verification-modal-martys-container" }, { children: isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })) })), _jsxs("div", __assign({ className: "verification-modal-bottom-btns-container" }, { children: [_jsx(SVGImageButton, { onClick: onScanAgain, title: t("verification_modal_phone.scan_again", "SCAN AGAIN"), SVGImage: RefreshSVG, backgroundColour: MAIN_BLUE, titleColour: WHITE, SVGColour: WHITE }), _jsx("div", { className: "dummy-gap" }), _jsx(SimpleButton, { onClick: onCancel, title: t("verification_modal_phone.cancel", "CANCEL") })] }))] }));
+        contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [!isScanning && _jsx("p", __assign({ style: { alignSelf: 'center' } }, { children: t("verification_modal_phone.no_robots_found", "No devices found") })), _jsx("div", __assign({ className: "verification-modal-martys-container" }, { children: isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })) })), _jsxs("div", __assign({ className: "verification-modal-bottom-btns-container" }, { children: [_jsx(SVGImageButton, { onClick: onScanAgain, title: t("verification_modal_phone.scan_again", "SCAN AGAIN"), SVGImage: RefreshSVG, backgroundColour: MAIN_BLUE, titleColour: WHITE, SVGColour: WHITE }), _jsx("div", { className: "dummy-gap" }), _jsx(SimpleButton, { onClick: onCancel, title: t("verification_modal_phone.cancel", "CANCEL") })] }))] }));
     }
     else {
         contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [_jsxs("div", __assign({ className: "verification-modal-martys-container" }, { children: [isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })), foundRICsState.map(function (raftObj, raftIdx) {
-                            return _jsxs(Fragment, { children: [_jsxs("button", __assign({ type: "button", className: "verification-modal-marty-name-row-container", onClick: function () { return onSelectRaft(raftIdx); }, "aria-label": "".concat(t("verification_modal_phone.select_robot", "Select robot"), " ").concat(raftObj._localName) }, { children: [_jsx("p", __assign({ className: "verification-modal-marty-name" }, { children: raftObj._localName })), _jsx("div", __assign({ className: "verification-modal-marty-signal-container" }, { children: _jsx(RICSignal, { signalStrength: raftObj._rssi }) })), _jsx(BluetoothSVG, { fill: MAIN_BLUE, "aria-hidden": "true" })] })), selectedRICIdx === raftIdx && _jsxs("div", { children: [_jsx("p", __assign({ className: "verification-modal-martys-back-hint" }, { children: isLoading ? t("verification_modal_phone.loading", "Loading...") : t("verification_modal_phone.look_on_back", { raftType: connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.type }) })), _jsxs("div", __assign({ className: "verification-modal-led-row-container" }, { children: [_jsx(LEDs, { coloursArr: randomColours, connectedRaft: connectedRaft }), !isLoading && _jsx(SimpleButton, { onClick: onCancel, title: t("verification_modal_phone.no", "No"), borderColour: "red", colour: "white", textColour: "red" }), !isLoading && _jsx(SimpleButton, { onClick: onYes, title: t("connection.yes") })] }))] })] }, raftIdx);
+                            return _jsxs(Fragment, { children: [_jsxs("button", __assign({ type: "button", className: "verification-modal-marty-name-row-container", onClick: function () { return onSelectRaft(raftIdx); }, "aria-label": "".concat(t("verification_modal_phone.select_robot", "Select device"), " ").concat(raftObj._localName) }, { children: [_jsx("p", __assign({ className: "verification-modal-marty-name" }, { children: raftObj._localName })), _jsx("div", __assign({ className: "verification-modal-marty-signal-container" }, { children: _jsx(RICSignal, { signalStrength: raftObj._rssi }) })), _jsx(BluetoothSVG, { fill: MAIN_BLUE, "aria-hidden": "true" })] })), selectedRICIdx === raftIdx && _jsxs("div", { children: [_jsx("p", __assign({ className: "verification-modal-martys-back-hint" }, { children: isLoading ? t("verification_modal_phone.loading", "Loading...") : t("verification_modal_phone.look_on_back", { raftType: connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.type }) })), _jsxs("div", __assign({ className: "verification-modal-led-row-container" }, { children: [_jsx(LEDs, { coloursArr: randomColours, connectedRaft: connectedRaft }), !isLoading && _jsx(SimpleButton, { onClick: onCancel, title: t("verification_modal_phone.no", "No"), borderColour: "red", colour: "white", textColour: "red" }), !isLoading && _jsx(SimpleButton, { onClick: onYes, title: t("connection.yes") })] }))] })] }, raftIdx);
                         })] })), _jsxs("div", __assign({ className: "verification-modal-bottom-btns-container" }, { children: [_jsx(SVGImageButton, { onClick: onScanAgain, title: t("connection.scan_again"), SVGImage: RefreshSVG, backgroundColour: MAIN_BLUE, titleColour: WHITE, SVGColour: WHITE, disabled: isScanning }), _jsx("div", { className: "dummy-gap" }), _jsx(SimpleButton, { onClick: onCancel, title: t("connection.cancel") })] }))] }));
     }
     return contentJSX;

package/dist-types/src/i18n.js

@@ -134,7 +134,7 @@ var resources = {
             "analytics": {
                 "accept": "YES, I ACCEPT!",
                 "analytics_consent_modal_title": "Help Us Improve!",
-                "info_1": "To help us improve your experience, we’d like to gather some info about your robot and the features of the app you use. Using this app requires us to store a session cookie in your device storage. The cookie doesn’t contain any personal information and simply lets our app remember your device between sessions.",
+                "info_1": "To help us improve your experience, we’d like to gather some info about your device and the features of the app you use. Using this app requires us to store a session cookie in your device storage. The cookie doesn’t contain any personal information and simply lets our app remember your device between sessions.",
                 "info_2": "All data is strictly anonymous, confidential, and will never be shared outside of Robotical.",
                 "info_3": "Any questions, let us know at hello@robotical.io.",
                 "more_info": "MORE INFORMATION",
@@ -162,7 +162,7 @@ var resources = {
                 "calibrating_white": "Calibrating on white surface...",
                 "finish_calibration": "Finish Calibration",
                 "lift_in_air": "Lift Marty about 30cm into the air, then start calibration.",
-                "lift_in_air_warning": "Robot not in the air. Please lift it up.",
+                "lift_in_air_warning": "Marty is not in the air. Please lift it up.",
                 "lift_in_air_error": "Please lift Marty into the air and try again.",
                 "place_on_white_finish": "Place Marty on a white surface and finish calibration!",
                 "start_air_calibration": "Start Air Calibration",
@@ -196,6 +196,7 @@ var resources = {
             "cog_configuration": {
                 "coming_soon": "Coming Soon...",
                 "not_supported": "Cog configuration is not supported on this device.",
+                "update_cog_ipad_message": "Cog updates cannot run from this iPad. Open {{updateUrl}} in Chrome on a laptop, desktop, or Chromebook, then connect Cog to that computer with a USB cable.",
                 "update_cog_link": "You can update your Cog <0>here</0>.",
                 "your_cog_version": "Your Cog Version is",
                 "up_to_date": "Cog up to date"
@@ -217,6 +218,7 @@ var resources = {
                 "update_marty": "Update Your Marty",
                 "wifi": "Wifi",
                 "marty_up_to_date": "Marty up to date",
+                "update_marty_ipad_message": "Marty updates cannot run from this iPad. Open {{updateUrl}} in Chrome on a laptop, desktop, or Chromebook, then connect Marty to that computer with a USB cable.",
                 "update_marty_link": "You can update your Marty <0>here</0>."
             },
             "connection": {
@@ -225,11 +227,11 @@ var resources = {
                 "unplugged_modal_body": "Your Marty is currently in unplugged mode. If you want to dissconect Marty from unplugged mode, please press the \"MODE\"/\"A\" button on the back of Marty and try again!",
                 "unplugged_modal_button": "Got it!",
                 "cancel": "Cancel",
-                "choose_robot_cta": "Choose robot to connect",
-                "choose_robot_prompt": "Choose the robot you want to connect.",
-                "choose_robot_title": "Choose a Robot",
+                "choose_robot_cta": "Choose device to connect",
+                "choose_robot_prompt": "Choose the device you want to connect.",
+                "choose_robot_title": "Choose a Device",
                 "cog_verification_prompt": "Choose how you want to verify your Cog connection.",
-                "connect_another_robot": "Connect another robot",
+                "connect_another_robot": "Connect another device",
                 "connect_cog": "Connect Cog",
                 "connect_cog_subtitle": "Choose Bluetooth verification with LED lights or QR.",
                 "connect_marty": "Connect Marty",
@@ -238,6 +240,7 @@ var resources = {
                 "connecting_to": "Connecting to",
                 "connecting_loading": "This shouldn't take long!",
                 "connecting_msg": "Connecting...",
+                "unsupported_web_bluetooth_browser": "This browser can't connect to Marty or Cog over Bluetooth. Please use Chrome or Edge, or use the iPad app.",
                 "led_subtitle": "Check LED signals for verification.",
                 "led_title": "LED Lights Verification",
                 "looking_for_raft": "Looking for {{raftType}}...",
@@ -294,7 +297,7 @@ var resources = {
                 "title": "HELP & SUPPORT",
                 "troubleshooting_bluetooth": "Please make sure that your device's bluetooth is turned on.",
                 "troubleshooting_heading": "Troubleshooting:",
-                "troubleshooting_robot": "Make sure your robot is on with Bluetooth enabled and that you are nearby.",
+                "troubleshooting_robot": "Make sure your device is on with Bluetooth enabled and that you are nearby.",
                 "warranty_dashboard": "Warranty Service Dashboard",
                 "warranty_registration": "Warranty Service Registration",
                 "translation_credits": "Translation Credits"
@@ -326,39 +329,39 @@ var resources = {
                 "activities": "Activities",
                 "games": "Cog Games",
                 "home": "Home",
-                "not_connected_robot_msg_for_configuration_page": "Oops! It looks like you’re not connected to a robot. Connect to a robot via bluetooth to access the configuration page"
+                "not_connected_robot_msg_for_configuration_page": "Oops! It looks like you’re not connected to a device. Connect to a device via Bluetooth to access the configuration page"
             },
             "report_issue": {
                 "app_issue_desc": "Report an application issue.",
                 "app_issue_title": "App Issue",
                 "cancel": "Cancel",
-                "robot_issue_desc": "Report a robot issue.",
-                "robot_issue_register": "Register your robot in the service program to report a robot issue.",
-                "robot_issue_title": "Robot Issue",
+                "robot_issue_desc": "Report a device issue.",
+                "robot_issue_register": "Register your device in the service program to report a device issue.",
+                "robot_issue_title": "Device Issue",
                 "title": "What type of issue you'd like to report"
             },
             "select_all": "Select All",
             "service_program": {
-                "add_another_robot_bt": "Add Another Robot via Bluetooth",
-                "add_more_robots": "Add more robots",
-                "add_more_robots_info_bt_1": "Turn on your Marty, click the \"Add Another Robot\" button and select it from the list of available devices.",
-                "add_more_robots_info_bt_2": "Repeat this process for each additional robot you wish to associate with the warranty account.",
-                "add_more_robots_info_paragraph": "Please scan the code on the robot (if there is no code, please use the Bluetooth method)",
-                "add_more_robots_info_title": "Effortlessly add multiple robots to the same warranty account by following these simple steps 🤖✨",
-                "add_more_robots_title": "Add more robots",
-                "add_more_robots_tooltip": "Add more robots associated with this email and school.",
-                "add_robots_bt": "Add Robots via Bluetooth",
-                "add_robots_qr": "Add Robots via QR Code",
+                "add_another_robot_bt": "Add Another Device via Bluetooth",
+                "add_more_robots": "Add more devices",
+                "add_more_robots_info_bt_1": "Turn on your device, click the \"Add Another Device\" button and select it from the list of available devices.",
+                "add_more_robots_info_bt_2": "Repeat this process for each additional device you wish to associate with the warranty account.",
+                "add_more_robots_info_paragraph": "Please scan the code on the device (if there is no code, please use the Bluetooth method)",
+                "add_more_robots_info_title": "Effortlessly add multiple devices to the same warranty account by following these simple steps.",
+                "add_more_robots_title": "Add more devices",
+                "add_more_robots_tooltip": "Add more devices associated with this email and school.",
+                "add_robots_bt": "Add Devices via Bluetooth",
+                "add_robots_qr": "Add Devices via QR Code",
                 "after_registration_bold": "After",
-                "after_registration_info": "registration is complete, you can visit the Warranty Dashboard to manage your robots, view their warranty status, manage analytics consent, and more.",
+                "after_registration_info": "registration is complete, you can visit the Warranty Dashboard to manage your devices, view their warranty status, manage analytics consent, and more.",
                 "agree_terms_prefix": "I agree to the",
                 "cancel": "Cancel",
-                "connect_or_add_robot": "Please connect to a robot or click 'Add More Robots' to add additional robots.",
+                "connect_or_add_robot": "Please connect to a device or click 'Add More Devices' to add additional devices.",
                 "email_label": "Email:",
                 "email_send_error": "Something went wrong while sending the email. Please try again later.",
                 "enter_email": "Please enter a valid email address.",
                 "getting_serials": "Getting serial numbers...",
-                "info_paragraph_1": "Your Marty comes with a free 2 years warranty - please activate it by linking your robot to an e-mail address.",
+                "info_paragraph_1": "Your Marty comes with a free 2 years warranty - please activate it by linking your Marty to an e-mail address.",
                 "info_title": "Activate Marty's Warranty",
                 "info_why_error": "If you report an error through the app, we'll reach out through this email address. Please use the best e-mail address to discuss technical support for your Martys. This address will only be used for support-related communication.",
                 "info_why_fault": "If your Marty develops a fault, an error log can be sent to Robotical so we can fix the issue immediately or get you a replacement.",
@@ -366,7 +369,7 @@ var resources = {
                 "must_agree_terms": "You must agree to the warranty terms to use this service.",
                 "registering": "Registering...",
                 "registration_email_sent": "Registration email sent to {{email}}! To complete the registration, please click the link in the email.",
-                "scanning": "Scanning for more robots...",
+                "scanning": "Scanning for more devices...",
                 "school_label": "School/Establishment (if applicable):",
                 "serial_already_registered": "Serial number {{serial}} is already registered. It will not be added to the list.",
                 "serial_label": "Serial Number(s):",
@@ -384,7 +387,7 @@ var resources = {
                 "student": "I am a student",
                 "student_desc": "Play, Program and Learn!",
                 "teacher": "I am a teacher",
-                "teacher_desc": "Register your Marty and manage your robots.",
+                "teacher_desc": "Register your Marty and manage your devices.",
                 "title": "Who are you?"
             },
             "verification_modal_phone": {
@@ -392,7 +395,7 @@ var resources = {
                 "loading": "Loading...",
                 "look_on_back": "Look on the back of the {{raftType}}, do these lights appear?",
                 "no": "No",
-                "no_robots_found": "No robots found",
+                "no_robots_found": "No devices found",
                 "scan_again": "SCAN AGAIN",
                 "yes": "Yes"
             },

package/dist-types/src/state-observables/modal/ModalObserver.d.ts

@@ -1,9 +1,12 @@
 import { ReactNode } from "react";
 export type ModalContentType = ReactNode;
+export type ModalLogoType = "robotical" | "marty" | "cog" | "none";
 export type ModalEventTopics = "SetModal" | "CloseModal" | "CloseModalWithoutAnimation" | "UpdateModalProps";
 export type ModalStateData = {
     modalContent?: ModalContentType;
     modalTitle?: string;
+    closeModalReturnValue?: unknown;
+    modalLogo?: ModalLogoType;
     newWindowLink?: string;
     withCloseButton?: boolean;
     withLogo?: boolean;

package/dist-types/src/state-observables/modal/ModalState.d.ts

@@ -1,5 +1,6 @@
-import { ModalContentType, ModalEventTopics, ModalObservable, ModalObserver, ModalStateData } from "./ModalObserver";
+import type { ModalContentType, ModalEventTopics, ModalLogoType, ModalObservable, ModalObserver, ModalStateData } from "./ModalObserver";
 type ModalReturnValue = any;
+type ModalLogoInput = boolean | ModalLogoType;
 declare class ModalState implements ModalObservable {
     modalContent: ModalContentType | null;
     modalTitle: string;
@@ -8,10 +9,12 @@ declare class ModalState implements ModalObservable {
     private _modalResolve;
     private _modalReject;
     constructor();
-    setModal(modalContent: ModalContentType, modalTitle: string, withLogo?: boolean): Promise<ModalReturnValue>;
+    setModal(modalContent: ModalContentType, modalTitle: string, modalLogoInput?: ModalLogoInput, withCloseButton?: boolean, closeModalReturnValue?: ModalReturnValue): Promise<ModalReturnValue>;
     closeModal(modalReturnValue?: ModalReturnValue, onCloseCb?: () => void): void;
     closeModalWithoutAnimation(modalReturnValue?: ModalReturnValue, onCloseCb?: () => void): void;
     updateModalProps(updatedProps: {
+        closeModalReturnValue?: ModalReturnValue;
+        modalLogo?: ModalLogoType;
         modalTitle?: string;
         withCloseButton?: boolean;
     }): void;

package/dist-types/src/state-observables/modal/ModalState.js

@@ -1,3 +1,15 @@
+var normalizeModalLogo = function (modalLogoInput) {
+    if (typeof modalLogoInput === "string") {
+        return {
+            modalLogo: modalLogoInput,
+            withLogo: modalLogoInput !== "none",
+        };
+    }
+    return {
+        modalLogo: modalLogoInput ? "robotical" : "none",
+        withLogo: modalLogoInput,
+    };
+};
 var ModalState = /** @class */ (function () {
     function ModalState() {
         this._observers = {};
@@ -5,15 +17,17 @@ var ModalState = /** @class */ (function () {
         this._modalResolve = function () { };
         this._modalReject = function () { };
     }
-    ModalState.prototype.setModal = function (modalContent, modalTitle, withLogo) {
+    ModalState.prototype.setModal = function (modalContent, modalTitle, modalLogoInput, withCloseButton, closeModalReturnValue) {
         var _this = this;
-        if (withLogo === void 0) { withLogo = true; }
+        if (modalLogoInput === void 0) { modalLogoInput = true; }
+        if (withCloseButton === void 0) { withCloseButton = false; }
+        var _a = normalizeModalLogo(modalLogoInput), modalLogo = _a.modalLogo, withLogo = _a.withLogo;
         this._modalPromise = new Promise(function (resolve, reject) {
             _this._modalResolve = resolve;
             _this._modalReject = reject;
             _this.modalContent = modalContent;
             _this.modalTitle = modalTitle;
-            _this.publish("SetModal", { modalContent: modalContent, modalTitle: modalTitle, withLogo: withLogo });
+            _this.publish("SetModal", { modalContent: modalContent, modalTitle: modalTitle, modalLogo: modalLogo, withLogo: withLogo, withCloseButton: withCloseButton, closeModalReturnValue: closeModalReturnValue });
         });
         return this._modalPromise;
     };

package/dist-types/src/store/SelectedRaftContext.js

@@ -37,7 +37,7 @@ var ConnectedRaftContext = createContext({
 // Provider component
 export var ConnectedRaftContentProvider = function (_a) {
     var children = _a.children;
-    var _b = useState([{ id: NewRobotIdE.NEW, isSelected: true, name: "Connect to new robot", type: RaftTypeE.undefined }]), connectedRafts = _b[0], setConnectedRafts = _b[1];
+    var _b = useState([{ id: NewRobotIdE.NEW, isSelected: true, name: "Connect to new device", type: RaftTypeE.undefined }]), connectedRafts = _b[0], setConnectedRafts = _b[1];
     var _c = useState(0), nameUpdatedState = _c[0], setNameUpdatedState = _c[1];
     useEffect(function () {
         window.applicationManager.connectedRaftsContext = connectedRafts;

package/dist-types/src/utils/feedback/feedbackConnectionEligibility.d.ts

@@ -15,7 +15,7 @@ export type FeedbackRobotConnectionDetails = {
     selectedRaftType: RaftTypeE.MARTY | RaftTypeE.COG;
     selectedRaftSerialNumber: string | null;
 };
-export declare const FEEDBACK_REQUIRES_ROBOT_CONNECTION_MESSAGE = "Please connect to a robot before sending feedback.";
+export declare const FEEDBACK_REQUIRES_ROBOT_CONNECTION_MESSAGE = "Please connect to a device before sending feedback.";
 export declare function hasActiveRobotConnection(applicationManager?: ApplicationManagerWithConnections | undefined): boolean;
 export declare function getActiveFeedbackRobotConnection(applicationManager?: ApplicationManagerWithConnections | undefined): FeedbackRobotConnectionDetails | null;
 export declare function isRobotConnectionRequiredForFeedbackSource(source: string): boolean;

package/dist-types/src/utils/feedback/feedbackConnectionEligibility.js

@@ -1,5 +1,5 @@
 import { RaftTypeE } from "../../types/raft";
-export var FEEDBACK_REQUIRES_ROBOT_CONNECTION_MESSAGE = "Please connect to a robot before sending feedback.";
+export var FEEDBACK_REQUIRES_ROBOT_CONNECTION_MESSAGE = "Please connect to a device before sending feedback.";
 function getApplicationManager() {
     if (typeof window === "undefined") {
         return undefined;

package/dist-types/src/utils/feedback/submitFeedback.js

@@ -183,10 +183,10 @@ export function buildFeedbackText(record) {
         lines.push("Page: ".concat(page));
     }
     if (selectedRaftType) {
-        lines.push("Robot type: ".concat(selectedRaftType));
+        lines.push("Device type: ".concat(selectedRaftType));
     }
     if (selectedRaftSerialNumber) {
-        lines.push("Robot serial number: ".concat(selectedRaftSerialNumber));
+        lines.push("Device serial number: ".concat(selectedRaftSerialNumber));
     }
     if (record.context) {
         var contextWithoutPage = Object.fromEntries(Object.entries(record.context).filter(function (_a) {

package/package.json

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