Compare commits

...
10 changed files with 40 additions and 17 deletions
+12 -3
View File
@@ -109,10 +109,19 @@ pipeline {
stage('Upload') {
steps { script {
sshagent(credentials: ['nix-cache-ssh']) {
nix.shell("""
nix.shell(
"""
find /nix/store/ -mindepth 1 -maxdepth 1 -type d \
-not -name '*.links' -and -not -name '*-status-mobile-*' \
| xargs nix copy --to ${NIX_SSH_REMOTE}
-not -name "*.links" -and -not -name "*-status-mobile-*" \
-and -not -name "tmp-*" \
-print0 | xargs -0 nix-store -qR | sort -u > "${WORKSPACE_TMP}"/store-paths.txt
""",
pure: false
)
nix.shell(
"""
nix-store --export < "${WORKSPACE_TMP}"/store-paths.txt | \\
ssh ${env.NIX_SSHOPTS} ${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST} ${env.NIX_STORE_CMD} --import
""",
pure: false
)
@@ -6,6 +6,7 @@
[legacy.status-im.ui.components.list.views :as list]
[quo.core :as quo]
[re-frame.core :as re-frame]
[react-native.clipboard :as clipboard]
[status-im.config :as config]
[status-im.feature-flags :as ff]
[utils.i18n :as i18n]
@@ -17,7 +18,8 @@
light-client-enabled?
store-confirmations-enabled?
current-fleet
peer-syncing-enabled?]}]
peer-syncing-enabled?
analytics-user-id]}]
(keep
identity
[(when (ff/enabled? ::ff/app-monitoring.intentional-crash)
@@ -29,6 +31,12 @@
:on-press (fn []
(re-frame/dispatch [:app-monitoring/intended-panic
"status-mobile intentional panic"]))})
(when (ff/enabled? ::ff/analytics.copy-user-id)
{:size :small
:title "Copy analytics user ID"
:accessibility-label :copy-analytics-user-id
:on-press (fn []
(clipboard/set-string analytics-user-id))})
{:size :small
:title (i18n/label :t/log-level)
:accessibility-label :log-level-settings-button
@@ -108,7 +116,8 @@
store-confirmations-enabled? [:profile/store-confirmations-enabled?]
current-log-level [:log-level/current-log-level]
current-fleet [:fleets/current-fleet]
peer-syncing-enabled? [:profile/peer-syncing-enabled?]]
peer-syncing-enabled? [:profile/peer-syncing-enabled?]
analytics-user-id [:centralized-metrics/user-id]]
[:<>
[quo/page-nav
{:type :title
@@ -123,6 +132,7 @@
:store-confirmations-enabled? store-confirmations-enabled?
:current-fleet current-fleet
:dev-mode? false
:peer-syncing-enabled? peer-syncing-enabled?})
:peer-syncing-enabled? peer-syncing-enabled?
:analytics-user-id analytics-user-id})
:key-fn (fn [_ i] (str i))
:render-fn render-item}]]))
+2 -1
View File
@@ -275,7 +275,8 @@
{:events [:chat/unmute-chat-community]}
[{:keys [db]} chat-id]
(let [{:keys [community-id]} (get-in db [:chats chat-id])]
{:db (assoc-in db [:communities community-id :muted] false)}))
(when community-id
{:db (assoc-in db [:communities community-id :muted] false)})))
(rf/defn mute-chat-failed
{:events [:chat/mute-failed]}
+4 -3
View File
@@ -75,14 +75,15 @@
(rf/reg-event-fx
:profile/get-profiles-overview-success
(fn [{:keys [db]}
[{accounts :accounts
{:keys [userConfirmed enabled]} :centralizedMetricsInfo}]]
[{accounts :accounts
{:keys [userConfirmed enabled userID]} :centralizedMetricsInfo}]]
(let [profiles (reduce-profiles accounts)
profiles-key-uids (keys profiles)
new-db (cond-> db
:always
(assoc :centralized-metrics/user-confirmed? userConfirmed
:centralized-metrics/enabled? enabled)
:centralized-metrics/enabled? enabled
:centralized-metrics/user-id userID)
(seq profiles)
(assoc :profile/profiles-overview profiles))]
+1
View File
@@ -13,6 +13,7 @@
{::community.edit-account-selection (enabled-in-env? :FLAG_EDIT_ACCOUNT_SELECTION_ENABLED)
::community.view-token-requirements (enabled-in-env? :FLAG_VIEW_TOKEN_REQUIREMENTS)
::app-monitoring.intentional-crash (enabled-in-env? :FLAG_INTENTIONAL_CRASH_ENABLED)
::analytics.copy-user-id (enabled-in-env? :FLAG_ANALYTICS_COPY_USER_ID)
;; Feature toggled (off by default) because the desktop app disabled this
;; feature and we want both clients in sync. We keep the code because it
+1
View File
@@ -188,6 +188,7 @@
;; centralized-metrics
(reg-root-key-sub :centralized-metrics/enabled? :centralized-metrics/enabled?)
(reg-root-key-sub :centralized-metrics/user-confirmed? :centralized-metrics/user-confirmed?)
(reg-root-key-sub :centralized-metrics/user-id :centralized-metrics/user-id)
;;keycard
(reg-root-key-sub :keycard :keycard)
+3 -3
View File
@@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im",
"repo": "status-go",
"version": "v10.8.0",
"commit-sha1": "ba8fd51958686aea45e34e684ac925a4e65927f8",
"src-sha256": "0kqn5rkfsn7aqc2n2flqvkm6cc53ssk0mc1l84f4czg0paci0717"
"version": "ilmotta-mobile-21680/facilitate-analytics-testing",
"commit-sha1": "2d4ba44ac4bc206edb8bedff835f6562a68ba64b",
"src-sha256": "1ly2qzy81qj60wdz0r4777m7vqrm0xz6snkr0cqih2bbajqlm3f2"
}
@@ -43,7 +43,7 @@ class TestWalletCollectibles(MultipleSharedDeviceTestCase):
self.wallet_view.collectibles_tab.click()
self.wallet_view.set_network_in_wallet(self.network_name)
collectibles = {
"BVL": {"quantity": 2,
"BVL": {"quantity": 1,
"info": {"Account": "Account 1",
"Network": "Base",
"category": "Football Player",
@@ -102,8 +102,8 @@ class TestWalletCollectibles(MultipleSharedDeviceTestCase):
self.wallet_view.collectibles_tab_on_select_token_view.click()
time.sleep(5)
self.wallet_view.get_collectible_element('BVL').click()
self.wallet_view.amount_input_increase_button.click()
self.wallet_view.confirm_button.click()
# self.wallet_view.amount_input_increase_button.click()
# self.wallet_view.confirm_button.click()
for text in [self.account_name, self.sender_short_address]:
if not self.wallet_view.from_data_container.get_child_element_by_text(text).is_element_displayed():
self.errors.append(self.wallet_view,
@@ -118,7 +118,7 @@ class TestWalletCollectibles(MultipleSharedDeviceTestCase):
data_to_check = {
'Est. time': ' min',
'Max fees': r"[$]\d+.\d+",
'Recipient gets': '2 '
'Recipient gets': '1 '
}
for key, expected_value in data_to_check.items():
try:
Binary file not shown.

Before

Width:  |  Height:  |  Size: 329 KiB

After

Width:  |  Height:  |  Size: 330 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB