From 6e7cd3794e55ee5c484a03b4e52f804e975e0b39 Mon Sep 17 00:00:00 2001
From: Igor Mandrigin <i@mandrigin.ru>
Date: Wed, 9 Jan 2019 16:48:15 +0100
Subject: [PATCH] Enable mailserver confirmations on all builds (except
 release).

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
---
 .env                            | 2 +-
 .env.jenkins                    | 4 ++--
 .env.nightly                    | 2 +-
 .env.nightly.staging.fleet      | 2 +-
 .env.prod                       | 1 +
 STATUS_GO_VERSION               | 2 +-
 desktop_files/package.json.orig | 2 +-
 desktop_files/yarn.lock         | 4 ++--
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index d058538b15..d479b8445f 100644
--- a/.env
+++ b/.env
@@ -10,7 +10,7 @@ GROUP_CHATS_ENABLED=1
 HARDWALLET_ENABLED=0
 LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
-MAILSERVER_CONFIRMATIONS_ENABLED=0
+MAILSERVER_CONFIRMATIONS_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
 POW_TARGET=0.002
diff --git a/.env.jenkins b/.env.jenkins
index 6cb0f68fde..844ab8bba3 100644
--- a/.env.jenkins
+++ b/.env.jenkins
@@ -9,7 +9,7 @@ GROUP_CHATS_ENABLED=1
 HARDWALLET_ENABLED=0
 LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
-MAILSERVER_CONFIRMATIONS_ENABLED=0
+MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
@@ -17,4 +17,4 @@ POW_TARGET=0.002
 POW_TIME=1
 RN_BRIDGE_THRESHOLD_WARNINGS=0
 RPC_NETWORKS_ONLY=0
-STICKERS_ENABLED=1
+STICKERS_ENABLED=1
\ No newline at end of file
diff --git a/.env.nightly b/.env.nightly
index 61dec352e0..d9c562f193 100644
--- a/.env.nightly
+++ b/.env.nightly
@@ -7,7 +7,7 @@ FLEET=eth.beta
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
-MAILSERVER_CONFIRMATIONS_ENABLED=0
+MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
diff --git a/.env.nightly.staging.fleet b/.env.nightly.staging.fleet
index 1bb3bb03bd..67f7301b4d 100644
--- a/.env.nightly.staging.fleet
+++ b/.env.nightly.staging.fleet
@@ -7,7 +7,7 @@ FLEET=eth.staging
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
-MAILSERVER_CONFIRMATIONS_ENABLED=0
+MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
diff --git a/.env.prod b/.env.prod
index d0a75d8727..467e43588f 100644
--- a/.env.prod
+++ b/.env.prod
@@ -7,6 +7,7 @@ FLEET=eth.beta
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL_STATUS_GO=
 LOG_LEVEL=info
+MAILSERVER_CONFIRMATIONS_ENABLED=0
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=0
diff --git a/STATUS_GO_VERSION b/STATUS_GO_VERSION
index 9c411507e4..26290af6a3 100644
--- a/STATUS_GO_VERSION
+++ b/STATUS_GO_VERSION
@@ -1 +1 @@
-0.21.0g-beta.2
+0.23.0-beta.1
diff --git a/desktop_files/package.json.orig b/desktop_files/package.json.orig
index 2815bb5abb..4b8b8fc3c6 100644
--- a/desktop_files/package.json.orig
+++ b/desktop_files/package.json.orig
@@ -84,7 +84,7 @@
     "string_decoder": "0.10.31",
     "text-encoding": "^0.6.4",
     "url": "0.10.3",
-    "web3": "git+https://github.com/status-im/web3.js.git#0.20.1-status",
+    "web3": "git+https://github.com/status-im/web3.js.git#0.20.2-status",
     "web3-utils": "1.0.0-beta.36",
     "hi-base32": "0.5.0"
   },
diff --git a/desktop_files/yarn.lock b/desktop_files/yarn.lock
index f596fb25d6..86ccdc372f 100644
--- a/desktop_files/yarn.lock
+++ b/desktop_files/yarn.lock
@@ -9118,9 +9118,9 @@ web3-utils@1.0.0-beta.36:
     underscore "1.8.3"
     utf8 "2.1.1"
 
-"web3@git+https://github.com/status-im/web3.js.git#0.20.1-status":
+"web3@git+https://github.com/status-im/web3.js.git#0.20.2-status":
   version "0.20.1"
-  resolved "git+https://github.com/status-im/web3.js.git#dad342dc95f7d5a888411ed57c9618937e2b6ebd"
+  resolved "git+https://github.com/status-im/web3.js.git#958dbabff2c77615e23f5de678a6fae0b0d70147"
   dependencies:
     bignumber.js "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status"
     crypto-js "^3.1.4"