Bump y18n from 3.2.1 to 3.2.2

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

README.md

@@ -23,7 +23,6 @@ Built on:
     exitMessage: 'The chat is closed. You may close this window.',
     chatUnavailableMessage: 'The chat service is not available right now. Please try again later.',
     anonymousDisplayName: 'Anonymous',
-    enableEncryption: 'yes',
   }
 
   EmbeddableChatbox.mount(config);
@@ -42,7 +41,6 @@ Options:
 | `exitMessage` (optional) | Text to show if the user rejects the Terms of Use. | `The chat is closed. You may close this window.` |
 | `anonymousDisplayName` (optional) | The display name for the chat user. | `Anonymous` |
 | `chatUnavailableMessage` (optional) | Text to show if no-one is available to respond  | `The chat service is not available right now. Please try again later.` |
-| `enableEncryption` (optional) | if set to "yes" then the chat will be encrypted by default  | `yes` |
 
 ## Feature list
 
@@ -82,7 +80,7 @@ You can try this out on the [live demo](https://nomadic-labs.github.io/safesuppo
 
 Clone the project:
 ```
-git clone https://git.umycode.com/dave/safesupport-chatbox.git
+git clone https://github.com/nomadic-labs/safesupport-chatbox.git
 ```
 Install the dependencies:
 ```

dist/index.html

@@ -23,7 +23,6 @@
         exitMessage: 'The chat is closed. You may close this window.',
         chatUnavailableMessage: 'The chat service is not available right now. Please try again later.',
         anonymousDisplayName: 'Anonymous',
-        enableEncryption: 'no',
     }
 
       EmbeddableChatbox.mount(config);

public/index.html

@@ -23,7 +23,6 @@
         exitMessage: 'The chat is closed. You may close this window.',
         chatUnavailableMessage: 'The chat service is not available right now. Please try again later.',
         anonymousDisplayName: 'Anonymous',
-        enableEncryption: 'no',
     }
 
       EmbeddableChatbox.mount(config);

src/components/chatbox.jsx

@@ -38,7 +38,6 @@ const DEFAULT_EXIT_MESSAGE = "The chat is closed. You may close this window."
 const DEFAULT_ANONYMOUS_DISPLAY_NAME="Anonymous"
 const DEFAULT_CHAT_UNAVAILABLE_MESSAGE = "The chat service is not available right now. Please try again later."
 const DEFAULT_WAIT_MESSAGE = "Please be patient, our online facilitators are currently responding to other support requests."
-const DEFAULT_ENCRYPTION = "yes"
 
 
 class ChatBox extends React.Component {
@@ -230,13 +229,9 @@ class ChatBox extends React.Component {
     client.setDisplayName(this.props.anonymousDisplayName)
     this.setMatrixListeners(client)
 
-    if(this.props.enableEncryption == "yes"){
+    try {
-      try {
+      await client.initCrypto()
-        await client.initCrypto()
+    } catch(err) {
-      } catch(err) {
-        return this.initializeUnencryptedChat()
-      }
-    }else{
       return this.initializeUnencryptedChat()
     }
 
@@ -262,9 +257,7 @@ class ChatBox extends React.Component {
       isCryptoEnabled: false,
     })
 
-    if(this.props.enableEncryption == "yes"){
+    this.displayBotMessage({ body: RESTARTING_UNENCRYPTED_CHAT_MESSAGE })
-      this.displayBotMessage({ body: RESTARTING_UNENCRYPTED_CHAT_MESSAGE })
-    }
 
     let opts = {
       baseUrl: this.props.matrixServerUrl,
@@ -284,9 +277,7 @@ class ChatBox extends React.Component {
       client.setDisplayName(this.props.anonymousDisplayName)
       await this.createRoom(client)
       await client.startClient()
-      if(this.props.enableEncryption == "yes"){
+      this.displayBotMessage({ body: UNENCRYPTION_NOTICE })
-        this.displayBotMessage({ body: UNENCRYPTION_NOTICE })
-      }
     } catch(err) {
       console.log("error", err)
       this.handleInitError(err)
@@ -724,7 +715,6 @@ ChatBox.propTypes = {
   chatUnavailableMessage: PropTypes.string,
   anonymousDisplayName: PropTypes.string,
   waitMessage: PropTypes.string,
-  enableEncryption: PropTypes.string,
 }
 
 ChatBox.defaultProps = {
@@ -739,7 +729,6 @@ ChatBox.defaultProps = {
   anonymousDisplayName: DEFAULT_ANONYMOUS_DISPLAY_NAME,
   chatUnavailableMessage: DEFAULT_CHAT_UNAVAILABLE_MESSAGE,
   waitMessage: DEFAULT_WAIT_MESSAGE,
-  enableEncryption: DEFAULT_ENCRYPTION,
 }
 
 export default ChatBox;

src/outputs/bookmarklet.js

@@ -1,18 +1,17 @@
 import EmbeddableChatbox from './embeddable-chatbox';
 
 const config = {
-  matrixServerUrl: 'https://matrix.safesupport.chat',
+        matrixServerUrl: 'https://matrix.safesupport.chat',
-  botId: '@help-bot:safesupport.chat',
+        botId: '@help-bot:safesupport.chat',
-  roomName: 'Support Chat',
+        roomName: 'Support Chat',
-  termsUrl: 'https://tosdr.org/',
+        termsUrl: 'https://tosdr.org/',
-  introMessage: 'This chat application does not collect any of your personal data or any data from your use of this service.',
+        introMessage: "This chat application does not collect any of your personal data or any data from your use of this service.",
-  agreementMessage: 'Do you want to continue?',
+        agreementMessage: 'Do you want to continue?',
-  confirmationMessage: 'Waiting for a facilitator to join the chat...',
+        confirmationMessage: 'Waiting for a facilitator to join the chat...',
-  exitMessage: 'The chat is closed. You may close this window.',
+        exitMessage: 'The chat is closed. You may close this window.',
-  chatUnavailableMessage: 'The chat service is not available right now. Please try again later.',
+        chatUnavailableMessage: 'The chat service is not available right now. Please try again later.',
-  anonymousDisplayName: 'Anonymous',
+        anonymousDisplayName: 'Anonymous',
-  enableEncryption: 'no',
+    }
-};
 
 export default function bookmarklet() {
   if (window.EmbeddableChatbox) {

yarn.lock

@@ -2763,10 +2763,15 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001023, caniuse-lite@^1.0.30001036, caniuse-lite@^1.0.30001038:
+caniuse-lite@^1.0.30001023:
-  version "1.0.30001251"
+  version "1.0.30001023"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz#b82155827f3f5009077bdd2df3d8968bcbcc6fc4"
-  integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A==
+  integrity sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA==
+
+caniuse-lite@^1.0.30001036, caniuse-lite@^1.0.30001038:
+  version "1.0.30001038"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff"
+  integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -10411,9 +10416,9 @@ xtend@^4.0.0, xtend@~4.0.1:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
-  version "3.2.1"
+  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"