diff --git a/VERSION b/VERSION index 7cca401c7f3..cb1e4b75b1c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.32.0 +2.32.21975 diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index 50a57e20b35..df4cb77dee3 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.18' +library 'status-jenkins-lib@v1.9.20' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index 4df70f6c3d1..fa24628c819 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.18' +library 'status-jenkins-lib@v1.9.20' import groovy.json.JsonBuilder diff --git a/ci/Jenkinsfile.e2e-nightly b/ci/Jenkinsfile.e2e-nightly index 605a1524abe..f8cc14fca62 100644 --- a/ci/Jenkinsfile.e2e-nightly +++ b/ci/Jenkinsfile.e2e-nightly @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.18' +library 'status-jenkins-lib@v1.9.20' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index dc33988d566..f665fe70091 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.18' +library 'status-jenkins-lib@v1.9.20' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests index f715c17f509..d44e9793d22 100644 --- a/ci/Jenkinsfile.tests +++ b/ci/Jenkinsfile.tests @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.18' +library 'status-jenkins-lib@v1.9.20' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/tests/Jenkinsfile.e2e-nightly b/ci/tests/Jenkinsfile.e2e-nightly index d788fc4c59c..69b13eec36b 100644 --- a/ci/tests/Jenkinsfile.e2e-nightly +++ b/ci/tests/Jenkinsfile.e2e-nightly @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.13' +library 'status-jenkins-lib@v1.9.20' pipeline { diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs index c459666d781..03ff3e866ff 100644 --- a/ci/tests/Jenkinsfile.e2e-prs +++ b/ci/tests/Jenkinsfile.e2e-prs @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.13' +library 'status-jenkins-lib@v1.9.20' pipeline { diff --git a/ci/tests/Jenkinsfile.e2e-upgrade b/ci/tests/Jenkinsfile.e2e-upgrade index d78b29e054f..ad2e7e7b551 100644 --- a/ci/tests/Jenkinsfile.e2e-upgrade +++ b/ci/tests/Jenkinsfile.e2e-upgrade @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.13' +library 'status-jenkins-lib@v1.9.20' pipeline { diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean index 9e85b08370f..6cae0dc1448 100644 --- a/ci/tools/Jenkinsfile.fastlane-clean +++ b/ci/tools/Jenkinsfile.fastlane-clean @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.13' +library 'status-jenkins-lib@v1.9.20' pipeline { agent { label 'macos' } diff --git a/ci/tools/Jenkinsfile.nix-cache b/ci/tools/Jenkinsfile.nix-cache index 94153eb1ba6..ec90584ebd3 100644 --- a/ci/tools/Jenkinsfile.nix-cache +++ b/ci/tools/Jenkinsfile.nix-cache @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.13' +library 'status-jenkins-lib@v1.9.20' pipeline { agent { label params.AGENT_LABEL } diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta index 2bd1a19896b..b6ccea37987 100644 --- a/ci/tools/Jenkinsfile.playstore-meta +++ b/ci/tools/Jenkinsfile.playstore-meta @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.13' +library 'status-jenkins-lib@v1.9.20' pipeline { agent { label 'linux' } diff --git a/ci/tools/Jenkinsfile.xcode-clean b/ci/tools/Jenkinsfile.xcode-clean index 7b6b13416d6..25907424e8d 100644 --- a/ci/tools/Jenkinsfile.xcode-clean +++ b/ci/tools/Jenkinsfile.xcode-clean @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.13' +library 'status-jenkins-lib@v1.9.20' pipeline { agent { diff --git a/src/status_im/config.cljs b/src/status_im/config.cljs index e703732194b..7e2437e7b8b 100644 --- a/src/status_im/config.cljs +++ b/src/status_im/config.cljs @@ -26,11 +26,11 @@ (goog-define ALCHEMY_BASE_MAINNET_TOKEN "") (goog-define ALCHEMY_BASE_SEPOLIA_TOKEN "") (goog-define WALLET_CONNECT_PROJECT_ID "87815d72a81d739d2a7ce15c2cfdefb3") -(goog-define MIXPANEL_APP_ID "3350627") -(goog-define MIXPANEL_TOKEN "5c73bda2d36a9f688a5ee45641fb6775") (goog-define STATUS_BUILD_ETH_RPC_PROXY_USER "") (goog-define STATUS_BUILD_ETH_RPC_PROXY_PASSWORD "") (goog-define STATUS_BUILD_ETH_RPC_PROXY_URL "") +(goog-define MIXPANEL_APP_ID "") +(goog-define MIXPANEL_TOKEN "") (def mainnet-rpc-url (str "https://eth-archival.rpc.grove.city/v1/" POKT_TOKEN)) (def sepolia-rpc-url (str "https://sepolia-archival.rpc.grove.city/v1/" POKT_TOKEN)) @@ -53,8 +53,19 @@ (def opensea-link "https://opensea.io") (def opensea-tesnet-link "https://testnets.opensea.io") +;; These MixPanel values should be injected via the CI since they vary depending +;; on the environment, as we want to keep production and test/development +;; metrics separate. +;; +;; We primarily use two MixPanel projects: the production project is named +;; `status-im`, and the test project is `test.status-im`. +;; +;; During development, do not use the production app ID and token. (def mixpanel-app-id MIXPANEL_APP_ID) -(def mixpanel-token MIXPANEL_TOKEN) +(def mixpanel-token + "MixPanel token is not supposed to be secret, but we still want to avoid + committing it to source." + MIXPANEL_TOKEN) (def opensea-api-key OPENSEA_API_KEY) (def status-proxy-enabled? true)