diff --git a/.env b/.env index 5b9a41a622..0fe62fd671 100644 --- a/.env +++ b/.env @@ -14,3 +14,4 @@ COMPILE_VIEWS_ENABLED=0 POW_TARGET=0.001 POW_TIME=1 MIXPANEL_TOKEN=3f2e1a8970f159aa2a3d5dc5d65eab38 +DEFAULT_NETWORK=testnet_rpc diff --git a/.env.e2e b/.env.e2e new file mode 100644 index 0000000000..a38817e800 --- /dev/null +++ b/.env.e2e @@ -0,0 +1,17 @@ +TESTFAIRY_ENABLED=1 +STUB_STATUS_GO=0 +ETHEREUM_DEV_CLUSTER=1 +MAINNET_NETWORKS_ENABLED=1 +OFFLINE_INBOX_ENABLED=1 +OFFLINE_INBOX_MANY_ENABLED=0 +LOG_LEVEL=debug +LOG_LEVEL_STATUS_GO=info +JSC_ENABLED=1 +QUEUE_MESSAGE_ENABLED=1 +MANY_WHISPER_TOPICS_ENABLED=0 +RN_BRIDGE_THRESHOLD_WARNINGS=0 +COMPILE_VIEWS_ENABLED=0 +MIXPANEL_TOKEN=3f2e1a8970f159aa2a3d5dc5d65eab38 +POW_TARGET=0.001 +POW_TIME=1 +DEFAULT_NETWORK=testnet_rpc diff --git a/.env.jenkins b/.env.jenkins index f871802d09..a38817e800 100644 --- a/.env.jenkins +++ b/.env.jenkins @@ -14,3 +14,4 @@ COMPILE_VIEWS_ENABLED=0 MIXPANEL_TOKEN=3f2e1a8970f159aa2a3d5dc5d65eab38 POW_TARGET=0.001 POW_TIME=1 +DEFAULT_NETWORK=testnet_rpc diff --git a/.env.prod b/.env.prod index 9283337ce6..755931e9c3 100644 --- a/.env.prod +++ b/.env.prod @@ -14,3 +14,4 @@ COMPILE_VIEWS_ENABLED=0 MIXPANEL_TOKEN=2584e00100d319d12e538cc4d0fa9fc1 POW_TARGET=0.2 POW_TIME=1 +DEFAULT_NETWORK=testnet_rpc diff --git a/Jenkinsfile b/Jenkinsfile index 0bb18236ca..9e0124863f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -89,6 +89,11 @@ node ('macos1') { '\niOS: ' + ipaUrl } + // Android for e2e + stage('Build (Android) for e2e testing') { + sh 'cd android && mv app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/app-release.original.apk && ENVFILE=.env.e2e ./gradlew assembleRelease' + } + stage('Upload apk for e2e tests') { if (env.CHANGE_ID != null){ withCredentials([string(credentialsId: 'SAUCE_ACCESS_KEY', variable: 'key'), string(credentialsId: 'SAUCE_USERNAME', variable: 'username')]){ diff --git a/src/status_im/constants.cljs b/src/status_im/constants.cljs index 070091a1c3..0dc61de3c8 100644 --- a/src/status_im/constants.cljs +++ b/src/status_im/constants.cljs @@ -24,7 +24,7 @@ (def console-chat-id "console") -(def default-network "testnet_rpc") +(def default-network config/default-network) (def default-wallet-transactions {:filters diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs index 9ef991ed7e..507a8fadfa 100644 --- a/src/status_im/utils/config.cljs +++ b/src/status_im/utils/config.cljs @@ -34,6 +34,7 @@ (def rn-bridge-threshold-warnings-enabled? (enabled? (get-config :RN_BRIDGE_THRESHOLD_WARNINGS 0))) (def compile-views-enabled? (enabled? (get-config :COMPILE_VIEWS_ENABLED 0))) (def mixpanel-token (get-config :MIXPANEL_TOKEN)) +(def default-network (get-config :DEFAULT_NETWORK)) (def pow-target (js/parseFloat (get-config :POW_TARGET "0.001"))) (def pow-time (js/parseInt (get-config :POW_TIME "1")))