status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#3654] set default network in config 

Signed-off-by: Dmitry Novotochinov <trybeee@gmail.com>
This commit is contained in:
Dmitry Novotochinov 2018-03-28 15:49:53 +03:00
parent fd7b393ae0
commit 05dd8eba2a
No known key found for this signature in database
GPG Key ID: 267674DCC86628D9
7 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@ -14,3 +14,4 @@ COMPILE_VIEWS_ENABLED=0
POW_TARGET=0.001 POW_TARGET=0.001
POW_TIME=1 POW_TIME=1
MIXPANEL_TOKEN=3f2e1a8970f159aa2a3d5dc5d65eab38 MIXPANEL_TOKEN=3f2e1a8970f159aa2a3d5dc5d65eab38
DEFAULT_NETWORK=testnet_rpc

17
.env.e2e Normal file
View File

@ -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

1
.env.jenkins
View File

@ -14,3 +14,4 @@ COMPILE_VIEWS_ENABLED=0
MIXPANEL_TOKEN=3f2e1a8970f159aa2a3d5dc5d65eab38 MIXPANEL_TOKEN=3f2e1a8970f159aa2a3d5dc5d65eab38
POW_TARGET=0.001 POW_TARGET=0.001
POW_TIME=1 POW_TIME=1
DEFAULT_NETWORK=testnet_rpc

1
.env.prod
View File

@ -14,3 +14,4 @@ COMPILE_VIEWS_ENABLED=0
MIXPANEL_TOKEN=2584e00100d319d12e538cc4d0fa9fc1 MIXPANEL_TOKEN=2584e00100d319d12e538cc4d0fa9fc1
POW_TARGET=0.2 POW_TARGET=0.2
POW_TIME=1 POW_TIME=1
DEFAULT_NETWORK=testnet_rpc

5
Jenkinsfile vendored
View File

@ -89,6 +89,11 @@ node ('macos1') {
'\niOS: ' + ipaUrl '\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') { stage('Upload apk for e2e tests') {
if (env.CHANGE_ID != null){ if (env.CHANGE_ID != null){
withCredentials([string(credentialsId: 'SAUCE_ACCESS_KEY', variable: 'key'), string(credentialsId: 'SAUCE_USERNAME', variable: 'username')]){ withCredentials([string(credentialsId: 'SAUCE_ACCESS_KEY', variable: 'key'), string(credentialsId: 'SAUCE_USERNAME', variable: 'username')]){

2
src/status_im/constants.cljs
View File

@ -24,7 +24,7 @@
(def console-chat-id "console") (def console-chat-id "console")
(def default-network "testnet_rpc") (def default-network config/default-network)
(def default-wallet-transactions (def default-wallet-transactions
{:filters {:filters

1
src/status_im/utils/config.cljs
View File

@ -34,6 +34,7 @@
(def rn-bridge-threshold-warnings-enabled? (enabled? (get-config :RN_BRIDGE_THRESHOLD_WARNINGS 0))) (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 compile-views-enabled? (enabled? (get-config :COMPILE_VIEWS_ENABLED 0)))
(def mixpanel-token (get-config :MIXPANEL_TOKEN)) (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-target (js/parseFloat (get-config :POW_TARGET "0.001")))
(def pow-time (js/parseInt (get-config :POW_TIME "1"))) (def pow-time (js/parseInt (get-config :POW_TIME "1")))