Merge pull request #1474 from oxen-io/clearnet

Session v1.4.9

.github/workflows/build-binaries.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016, macos-latest, ubuntu-latest]
+        os: [windows-2016, macos-latest, ubuntu-18.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull-request.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016, macos-latest, ubuntu-latest]
+        os: [windows-2016, macos-latest, ubuntu-18.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016, macos-latest, ubuntu-latest]
+        os: [windows-2016, macos-latest, ubuntu-18.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "license": "GPL-3.0",
   "author": {
     "name": "Loki Project",
@@ -333,4 +333,4 @@
       "!dev-app-update.yml"
     ]
   }
-}
+}

ts/components/session/RegistrationTabs.tsx

@@ -506,7 +506,7 @@ export class RegistrationTabs extends React.Component<any, State> {
   private renderSignInButtons() {
     const { signInMode } = this.state;
 
-    const or = window.i18n('or');
+    // const or = window.i18n('or');
 
     if (signInMode === SignInMode.Default) {
       return (
@@ -519,7 +519,14 @@ export class RegistrationTabs extends React.Component<any, State> {
       );
     }
 
-    return <></>;
+    return (
+      <SessionButton
+        onClick={this.handleContinueYourSessionClick}
+        buttonType={SessionButtonType.Brand}
+        buttonColor={SessionButtonColor.Green}
+        text={window.i18n('continueYourSession')}
+      />
+    );
   }
 
   private renderTermsConditionAgreement() {