Compare commits

..
Author SHA1 Message Date
Parvesh Monu 6ed7e7a930 Logs for failed stickers 2024-08-16 14:07:45 +05:30
Shivek Khurana 37232eee7e 👓 Hide chain down toasts (#21055) 2024-08-15 19:00:31 +05:30
Sean HagstromandYevheniia Berdnyk 373ca6ec2d feature: require manual acceptance of terms-of-use and privacy-statement (#21010)
This change changes the initial onboarding screen to require users to manually accept the terms-of-use and privacy-statement before continuing to onboard into the app.

---------

Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com>
2024-08-15 10:41:12 +01:00
frankandIgor Sirotin fe28f44d4b chore_: remove passing node config when sync (#20949)
* chore_: remove passing node config when sync

https://github.com/status-im/status-go/compare/4a43b2b2...01f7787c

* chore_: remove passing deviceType

* chore_: update status-go

* fix_: remove calculating keystorePath and rootDataDir

* chore_: update status-go

* chore_: update status-go to v0.184.43

---------

Co-authored-by: Igor Sirotin <sirotin@status.im>
2024-08-15 14:14:54 +08:00
Andrea Maria Piana cd81519e9a drive stage from config
https://github.com/status-im/status-go/compare/a93c8572...1f7816dd
2024-08-14 20:10:19 +01:00
Sean Hagstrom d4a58ac2fb chore: add beta tags to communities and chat home screen titles (#21018)
* chore: add english translation for "Beta"

* tweak: add beta tags to communities and chat home screen titles

* fix: use smaller size for beta tags on chat and communities home screens
2024-08-14 16:47:15 +05:30
frank 75280c4db6 fix_:enable light client after sync (#21041) 2024-08-14 17:02:37 +08:00
17 changed files with 80 additions and 104 deletions
+1
View File
@@ -19,4 +19,5 @@ MAX_IMAGES_BATCH=1
DELETE_MESSAGE_ENABLED=1
FAST_CREATE_COMMUNITY_ENABLED=0
TEST_NETWORKS_ENABLED=0
STATUS_PROXY_STAGE_NAME=prod
FLAG_WALLET_CONNECT_ENABLED=1
@@ -36,11 +36,6 @@ class NetworkManager(private val reactContext: ReactApplicationContext) : ReactC
@ReactMethod
fun inputConnectionStringForBootstrapping(connectionString: String, configJSON: String, callback: Callback) {
val jsonConfig = JSONObject(configJSON)
val receiverConfig = jsonConfig.getJSONObject("receiverConfig")
val keyStorePath = utils.pathCombine(utils.getNoBackupDirectory(), "/keystore")
receiverConfig.put("keystorePath", keyStorePath)
receiverConfig.getJSONObject("nodeConfig").put("rootDataDir", utils.getNoBackupDirectory())
utils.executeRunnableStatusGoMethod(
{ Statusgo.inputConnectionStringForBootstrapping(connectionString, jsonConfig.toString()) },
callback
@@ -35,21 +35,7 @@ RCT_EXPORT_METHOD(inputConnectionStringForBootstrapping:(NSString *)cs
configJSON:(NSString *)configJSON
callback:(RCTResponseSenderBlock)callback) {
NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
NSError *error;
NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
NSMutableDictionary *receiverConfig = configDict[@"receiverConfig"];
NSMutableDictionary *nodeConfig = receiverConfig[@"nodeConfig"];
NSFileManager *fileManager = [NSFileManager defaultManager];
NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
NSString *keystoreDir = multiaccountKeystoreDir.path;
NSString *rootDataDir = rootUrl.path;
[receiverConfig setValue:keystoreDir forKey:@"keystorePath"];
[nodeConfig setValue:rootDataDir forKey:@"rootDataDir"];
NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];
NSString *result = StatusgoInputConnectionStringForBootstrapping(cs, modifiedConfigJSON);
NSString *result = StatusgoInputConnectionStringForBootstrapping(cs, configJSON);
callback(@[result]);
}
@@ -3,14 +3,30 @@
[quo.core :as quo]
[react-native.core :as rn]
[status-im.common.home.title-column.style :as style]
[status-im.common.plus-button.view :as plus-button]))
[status-im.common.plus-button.view :as plus-button]
[utils.i18n :as i18n]))
(defn view
[{:keys [label handler accessibility-label customization-color]}]
[{:keys [beta? label handler accessibility-label customization-color]}]
[rn/view style/title-column
[rn/view {:flex 1}
[rn/view
{:style {:flex 1
:align-items :center
:flex-direction :row}}
[quo/text style/title-column-text
label]]
label]
(when beta?
[rn/view
{:style {:padding-top 6
:padding-bottom 2}}
[quo/tag
{:accessibility-label :communities-chat-beta-tag
:size 24
:type :label
:label (i18n/label :t/beta)
:labelled? true
:blurred? false}]])]
(when handler
[plus-button/plus-button
{:on-press handler
+1 -2
View File
@@ -48,6 +48,7 @@
(def opensea-api-key OPENSEA_API_KEY)
(def status-proxy-enabled? true)
(def status-proxy-stage-name (get-config :STATUS_PROXY_STAGE_NAME "test"))
(def bootnodes-settings-enabled? (enabled? (get-config :BOOTNODES_SETTINGS_ENABLED "1")))
(def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED)))
(def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0")))
@@ -122,8 +123,6 @@
:waku.test
["enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im"]})
(def default-kdf-iterations 3200)
(def community-accounts-selection-enabled? true)
(def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
(def test-networks-enabled? (enabled? (get-config :TEST_NETWORKS_ENABLED "0")))
+2 -1
View File
@@ -118,7 +118,8 @@
(defn- banner-data
[profile-link]
{:title-props
{:label (i18n/label :t/messages)
{:beta? true
:label (i18n/label :t/messages)
:handler #(rf/dispatch
[:show-bottom-sheet {:content chat.actions.view/new-chat}])
:accessibility-label :new-chat-button}
@@ -1,10 +1,15 @@
(ns status-im.contexts.chat.messenger.messages.content.sticker-message.view
(:require [react-native.core :as rn]
[react-native.fast-image :as fast-image]))
[react-native.fast-image :as fast-image]
[oops.core :as oops]))
(defn view
[{:keys [url]}]
[rn/view {:style {:margin-top 6 :margin-bottom 4}}
[fast-image/fast-image
(print "------------ parvesh" url)
[rn/image
{:style {:width 120 :height 120}
:on-error (fn [e]
(print "------ parvesh error"
(oops/oget e "nativeEvent.error")))
:source {:uri (str url "&download=true")}}]])
@@ -64,7 +64,8 @@
(def ^:private banner-data
{:title-props
{:label (i18n/label :t/communities)
{:beta? true
:label (i18n/label :t/communities)
:handler (when config/fast-create-community-enabled?
#(rf/dispatch [:show-bottom-sheet {:content actions.home-plus/view}]))
:accessibility-label :new-communities-button}
@@ -7,9 +7,10 @@
:justify-content :flex-end})
(def text-container
{:flex 1
:flex-wrap :wrap
:text-align :center})
{:flex 1
:flex-direction :row
:flex-wrap :wrap
:align-self :center})
(def terms-privacy-container
{:gap 8
@@ -20,8 +21,7 @@
{:color colors/white-opa-70})
(def highlighted-text
{:flex 1
:color colors/white})
{:color colors/white})
(defn bottom-actions-container
[bottom-insets]
@@ -27,12 +27,11 @@
{:accessibility-label :terms-privacy-checkbox-container}
[quo/selectors
{:type :checkbox
:blur? true
:checked? terms-accepted?
:on-change #(set-terms-accepted? not)}]]
[rn/view {:style {:flex 1}}
[quo/text
{:style style/text-container
:size :paragraph-2}
[rn/view {:style style/text-container}
[quo/text
{:style style/plain-text
:size :paragraph-2}
@@ -42,7 +41,8 @@
{:content (fn [] [terms/terms-of-use])
:shell? true}])
:style style/highlighted-text
:size :paragraph-2}
:size :paragraph-2
:weight :medium}
(i18n/label :t/terms-of-service)]
[quo/text
{:style style/plain-text
@@ -54,7 +54,7 @@
:shell? true}])
:style style/highlighted-text
:size :paragraph-2
:weight :regular}
:weight :medium}
(i18n/label :t/intro-privacy-statement)]]]]
:button-one-label (i18n/label :t/sync-or-recover-profile)
:button-one-props {:type :dark-grey
@@ -11,6 +11,7 @@
{;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved
:wakuV2Nameserver "8.8.8.8"
:statusProxyEnabled config/status-proxy-enabled?
:statusProxyStageName config/status-proxy-stage-name
:statusProxyMarketUser config/STATUS_BUILD_PROXY_USER
:statusProxyMarketPassword config/STATUS_BUILD_PROXY_PASSWORD
:statusProxyBlockchainUser config/STATUS_BUILD_PROXY_USER
+10 -39
View File
@@ -3,8 +3,8 @@
[clojure.string :as string]
[native-module.core :as native-module]
[react-native.platform :as platform]
[status-im.config :as config]
[status-im.constants :as constants]
[status-im.contexts.profile.config :as profile.config]
[status-im.contexts.syncing.utils :as sync-utils]
[taoensso.timbre :as log]
[utils.i18n :as i18n]
@@ -21,26 +21,6 @@
{:events [:syncing/clear-states]}
[{:keys [db]} role]
{:db (dissoc db :syncing)})
(defn- get-default-node-config
[]
(let [log-level config/log-level
log-config (if (empty? log-level)
{:LogLevel "ERROR" :LogEnabled false}
{:LogLevel log-level :LogEnabled true})]
(merge {:WalletConfig (cond-> {:Enabled true}
(not= config/opensea-api-key "")
(assoc :OpenseaAPIKey config/opensea-api-key))
:WakuV2Config {;; Temporary fix until https://github.com/status-im/status-go/issues/3024
;; is resolved
:Nameserver "8.8.8.8"
:LightClient false}
:ShhextConfig {:VerifyTransactionURL config/verify-transaction-url
:VerifyENSURL config/verify-ens-url
:VerifyENSContractAddress config/verify-ens-contract-address
:VerifyTransactionChainID config/verify-transaction-chain-id}}
log-config)))
(defn- input-connection-string-callback
[res]
(log/info "[local-pairing] input-connection-string-for-bootstrapping callback"
@@ -69,24 +49,15 @@
(rf/defn initiate-local-pairing-with-connection-string
{:events [:syncing/input-connection-string-for-bootstrapping]}
[{:keys [db]} connection-string]
(let [default-node-config-string (.stringify js/JSON (clj->js (get-default-node-config)))
callback
(fn [final-node-config]
(let [config-map (.stringify js/JSON
(clj->js
{:receiverConfig
{:kdfIterations config/default-kdf-iterations
:nodeConfig final-node-config
:settingCurrentNetwork config/default-network
:deviceType platform/os
:deviceName
(native-module/get-installation-name)}}))]
(rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
(native-module/input-connection-string-for-bootstrapping
connection-string
config-map
input-connection-string-callback)))]
(native-module/prepare-dir-and-update-config "" default-node-config-string callback)))
(let [config-map (.stringify js/JSON
(clj->js
{:receiverConfig
{:createAccount (profile.config/create)}}))]
(rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
(native-module/input-connection-string-for-bootstrapping
connection-string
config-map
input-connection-string-callback)))
(rf/defn preparations-for-connection-string
{:events [:syncing/get-connection-string]}
+7 -9
View File
@@ -296,7 +296,6 @@
{:start-flow? true
:flow-id :wallet-bridge-flow}]]]}))
(rf/reg-event-fx :wallet/select-bridge-network
(fn [{:keys [db]} [{:keys [network-chain-id stack-id]}]]
{:db (assoc-in db [:wallet :ui :send :bridge-to-chain-id] network-chain-id)
@@ -497,16 +496,15 @@
(string/join ", ")))]
(when (seq down-chain-ids)
(log/info "[wallet] Chain(s) down: " down-chain-ids)
(log/info "[wallet] Chain name(s) down: " chain-names)
(log/info "[wallet] Test network enabled: " (boolean test-networks-enabled?))
(log/info "[wallet] Goerli network enabled: " (boolean is-goerli-enabled?)))
{:db (assoc-in db [:wallet :statuses :blockchains] chains)
:fx [(when chains-down?
[:dispatch
[:toasts/upsert
{:id :chains-down
:type :negative
:text (i18n/label :t/provider-is-down {:chains chain-names})
:duration constants/toast-chain-down-duration}]])]})))
;; NOTE <shivekkhurana>: We used to show an error toast, but disabled it because the down
;; signal is sent randomly. Needs to be investigated and enabled again !
;; Context: https://github.com/status-im/status-mobile/issues/21054
{:db (assoc-in db [:wallet :statuses :blockchains] chains)})))
(rf/reg-event-fx :wallet/reset-selected-networks
(fn [{:keys [db]}]
+3 -3
View File
@@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im",
"repo": "status-go",
"version": "v0.182.42",
"commit-sha1": "a93c857238c3002ae64da1bdbebea13f3392da8b",
"src-sha256": "0rrny83rnirpm5pwp8br6nnglijb4whx1xl6nwkm5lzfnnichg59"
"version": "v0.184.43",
"commit-sha1": "d394da0fc169cd432f01e1c3ba4c8490f5a937d1",
"src-sha256": "0zf753qjknb55fidskziy4m9flbba0447wk80j8xl02s4j1zp3km"
}
@@ -264,15 +264,15 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
expected_communities = {
# ' 0xUX': ['Design', 'Ethereum', 'Collaboration'],
'Status': ['Web3', 'Blockchain', 'Ethereum'],
# 'Status Inu': ['News', 'Social', 'Web3'],
'Status Inu': ['News', 'Social', 'Web3'],
}
for community_name, tags in expected_communities.items():
self.home.just_fyi("Check %s community tags in the Discover communities screen" % community_name)
card = self.home.get_discover_community_card_by_name(community_name=community_name)
try:
card.wait_for_visibility_of_element(30)
# if community_name == 'Status':
# card.swipe_to_web_element()
if community_name == 'Status':
card.swipe_to_web_element()
missing_tags = list()
for text in tags:
try:
@@ -281,17 +281,18 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
missing_tags.append(text)
if missing_tags:
self.errors.append("Community '%s' is missing tag(s) %s." % (community_name, ','.join(tags)))
# if community_name == 'Status':
self.home.just_fyi("Check Status community screen")
card.click()
if self.community_view.join_button.is_element_differs_from_template(
'status_community_join_button.png'):
self.errors.append("Status community Join button is different from expected template.")
if self.community_view.community_logo.is_element_differs_from_template('status_community_logo.png'):
self.errors.append("Status community logo is different from expected template.")
# self.community_view.close_community_view_button.click()
# self.home.swipe_up()
if community_name == 'Status':
self.home.just_fyi("Check Status community screen")
card.click()
if self.community_view.join_button.is_element_differs_from_template(
'status_community_join_button.png'):
self.errors.append("Status community Join button is different from expected template.")
if self.community_view.community_logo.is_element_differs_from_template('status_community_logo.png'):
self.errors.append("Status community logo is different from expected template.")
self.community_view.close_community_view_button.click()
self.home.swipe_up()
except TimeoutException:
self.errors.append("Community '%s' is not in the Discover Communities list." % community_name)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 KiB

After

Width:  |  Height:  |  Size: 172 KiB

+1
View File
@@ -186,6 +186,7 @@
"balance": "Balance",
"begin-set-up": "Begin setup",
"below-base-fee": "max fee below base fee",
"beta": "Beta",
"bio": "Bio",
"bio-added": "Bio added",
"bio-is-too-long": "Bio is too long",