v1.0.9

.eslintignore

@@ -30,3 +30,4 @@ ts/**/*.js
 # Libloki specific files
 libloki/test/components.js
 libloki/modules/mnemonic.js
+session-file-server/**

.github/workflows/build-binaries.yml

@@ -23,6 +23,9 @@ jobs:
       - name: Checkout git repo
         uses: actions/checkout@v2
 
+      - name: Pull git submodules
+        run: git submodule update --init
+
       - name: Install node
         uses: actions/setup-node@v1
         with:

.github/workflows/pull-request.yml

@@ -24,6 +24,15 @@ jobs:
       - name: Checkout git repo
         uses: actions/checkout@v2
 
+      - name: Pull git submodules
+        run: git submodule update --init
+
+      - name: Install file server dependency
+        run: |
+          cd session-file-server
+          yarn install;
+          cd -
+
       - name: Install node
         uses: actions/setup-node@v1
         with:

.github/workflows/release.yml

@@ -20,6 +20,9 @@ jobs:
       - name: Checkout git repo
         uses: actions/checkout@v2
 
+      - name: Pull git submodules
+        run: git submodule update --init
+
       - name: Install node
         uses: actions/setup-node@v1
         with:

.gitignore

@@ -37,3 +37,6 @@ ts/protobuf/*.d.ts
 
 # Ctags
 tags
+
+proxy.key
+proxy.pub

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "session-file-server"]
+	path = session-file-server
+	url = https://github.com/loki-project/session-file-server/

.prettierignore

@@ -54,3 +54,4 @@ stylesheets/_intlTelInput.scss
 # Coverage
 coverage/**
 .nyc_output/**
+session-file-server/**

CONTRIBUTING.md

@@ -94,9 +94,9 @@ There are a few scripts which you can use:
 
 ```
 yarn start - Start development
-yarn start-multi - Start second instance of development
+MULTI=1 yarn start - Start second instance of development
 yarn start-prod - Start production but in development mode
-yarn start-prod-multi - Start another instance of production
+MULTI=1 yarn start-prod - Start another instance of production
 ```
 
 For more than 2 clients, you may run the above command with `NODE_APP_INSTANCE` set before them.

_locales/en/messages.json

@@ -784,7 +784,7 @@
     "description": "Shown to separate the types of search results"
   },
   "messagesHeader": {
-    "message": "Session",
+    "message": "Conversations",
     "description": "Shown to separate the types of search results"
   },
   "settingsHeader": {
@@ -1014,6 +1014,10 @@
   "deviceIsSecondaryNoPairing": {
     "message": "This device is a secondary device and so cannot be linked."
   },
+  "pairingOngoing": {
+    "message":
+      "A pairing request is already ongoing. Restart the app if it takes too long."
+  },
   "allowPairing": {
     "message": "Allow Linking"
   },
@@ -1120,11 +1124,6 @@
     "message": " Type your message",
     "description": "Placeholder text in the message entry field"
   },
-  "secondaryDeviceDefaultFR": {
-    "message": "Please accept to enable messages to be synced across devices",
-    "description":
-      "Placeholder text in the message entry field when it is disabled because a secondary device conversation is visible"
-  },
   "sendMessageDisabledSecondary": {
     "message":
       "This pubkey belongs to a secondary device. You should never see this message",
@@ -2530,14 +2529,29 @@
     "message": "Remove"
   },
   "invalidHexId": {
-    "message": "Invalid Hex ID",
+    "message": "Invalid Session ID or LNS Name",
     "description":
-      "Error string shown when user type an invalid pubkey hex string"
+      "Error string shown when user types an invalid pubkey hex string"
+  },
+  "invalidLnsFormat": {
+    "message": "Invalid LNS Name",
+    "description": "Error string shown when user types an invalid LNS name"
   },
   "invalidPubkeyFormat": {
     "message": "Invalid Pubkey Format",
     "description": "Error string shown when user types an invalid pubkey format"
   },
+  "lnsMappingNotFound": {
+    "message": "There is no LNS mapping associated with this name",
+    "description": "Shown in toast if user enters an unknown LNS name"
+  },
+  "lnsLookupTimeout": {
+    "message": "LNS lookup timed out",
+    "description": "Shown in toast if user enters an unknown LNS name"
+  },
+  "lnsTooFewNodes": {
+    "message": "Not enough nodes currently active for LNS lookup"
+  },
   "conversationsTab": {
     "message": "Conversations",
     "description": "conversation tab title"
@@ -2720,7 +2734,7 @@
     "message": "Enter Session ID"
   },
   "pasteSessionIDRecipient": {
-    "message": "Enter a Session ID"
+    "message": "Enter a Session ID or LNS name"
   },
   "usersCanShareTheir...": {
     "message":
@@ -2902,5 +2916,8 @@
         "example": "10"
       }
     }
+  },
+  "useSenderKeys": {
+    "message": "Use Sender Keys"
   }
 }