diff --git a/.env b/.env index d2afc6525f1f..4b5ddd142909 100644 --- a/.env +++ b/.env @@ -34,5 +34,4 @@ FAST_CREATE_COMMUNITY_ENABLED=1 TEST_NETWORKS_ENABLED=1 SHOW_NOT_IMPLEMENTED_FEATURES=0 ENABLE_ALERT_BANNER=0 -FLAG_WALLET_CONNECT_ENABLED=1 API_LOGGING_ENABLED=1 diff --git a/.env.e2e b/.env.e2e index 54454a0a8152..21c896df2edd 100644 --- a/.env.e2e +++ b/.env.e2e @@ -37,6 +37,5 @@ SHOW_NOT_IMPLEMENTED_FEATURES=1 DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000 DELETE_MESSAGE_UNDO_TIME_LIMIT=10000 ENABLE_ALERT_BANNER=0 -FLAG_WALLET_CONNECT_ENABLED=1 MOBILE_DATA_SYNCING_TOGGLE_ENABLE=0 API_LOGGING_ENABLED=1 diff --git a/.env.jenkins b/.env.jenkins index 041440679d24..edd440605dd4 100644 --- a/.env.jenkins +++ b/.env.jenkins @@ -35,5 +35,4 @@ LOCAL_PAIRING_ENABLED=1 FAST_CREATE_COMMUNITY_ENABLED=1 TEST_NETWORKS_ENABLED=1 ENABLE_ALERT_BANNER=1 -FLAG_WALLET_CONNECT_ENABLED=1 API_LOGGING_ENABLED=1 diff --git a/.env.nightly b/.env.nightly index cf21f031e940..704e2225e810 100644 --- a/.env.nightly +++ b/.env.nightly @@ -22,5 +22,4 @@ DELETE_MESSAGE_ENABLED=1 FAST_CREATE_COMMUNITY_ENABLED=0 TEST_NETWORKS_ENABLED=0 ENABLE_ALERT_BANNER=1 -FLAG_WALLET_CONNECT_ENABLED=1 API_LOGGING_ENABLED=1 diff --git a/.env.release b/.env.release index c34df0d0eeed..890c56f42c5f 100644 --- a/.env.release +++ b/.env.release @@ -19,5 +19,4 @@ DELETE_MESSAGE_ENABLED=1 FAST_CREATE_COMMUNITY_ENABLED=0 TEST_NETWORKS_ENABLED=0 STATUS_PROXY_STAGE_NAME=prod -FLAG_WALLET_CONNECT_ENABLED=1 API_LOGGING_ENABLED=0 diff --git a/src/status_im/contexts/network/events.cljs b/src/status_im/contexts/network/events.cljs index f9c03fcb0ea8..9a4ed26f72ec 100644 --- a/src/status_im/contexts/network/events.cljs +++ b/src/status_im/contexts/network/events.cljs @@ -2,7 +2,6 @@ (:require [status-im.common.data-confirmation-sheet.view :as data-confirmation-sheet] [status-im.config :as config] - [status-im.feature-flags :as ff] [taoensso.timbre :as log] [utils.re-frame :as rf])) @@ -72,5 +71,4 @@ :network/on-network-status-change (fn [{:keys [db]} [connectivity-status]] {:db (assoc db :network/status connectivity-status) - :fx [(when (ff/enabled? ::ff/wallet.wallet-connect) - [:dispatch [:wallet-connect/reload-on-network-change (= :online connectivity-status)]])]})) + :fx [[:dispatch [:wallet-connect/reload-on-network-change (= :online connectivity-status)]]]})) diff --git a/src/status_im/contexts/shell/qr_reader/view.cljs b/src/status_im/contexts/shell/qr_reader/view.cljs index 322f6951cd2d..aeb4ff408ab9 100644 --- a/src/status_im/contexts/shell/qr_reader/view.cljs +++ b/src/status_im/contexts/shell/qr_reader/view.cljs @@ -7,7 +7,6 @@ [status-im.common.validation.general :as validators] [status-im.contexts.communities.events] [status-im.contexts.wallet.wallet-connect.utils.uri :as wc-uri] - [status-im.feature-flags :as ff] [utils.address :as utils-address] [utils.debounce :as debounce] [utils.i18n :as i18n] @@ -91,9 +90,7 @@ ;; TODO: https://github.com/status-im/status-mobile/issues/18744 nil - (and - (wc-uri/valid-uri? scanned-text) - (ff/enabled? ::ff/wallet.wallet-connect)) + (wc-uri/valid-uri? scanned-text) (handle-wallet-connect scanned-text) (url? scanned-text) diff --git a/src/status_im/contexts/wallet/common/account_switcher/view.cljs b/src/status_im/contexts/wallet/common/account_switcher/view.cljs index a063ae754310..72556d5adfa6 100644 --- a/src/status_im/contexts/wallet/common/account_switcher/view.cljs +++ b/src/status_im/contexts/wallet/common/account_switcher/view.cljs @@ -4,7 +4,6 @@ [status-im.contexts.wallet.sheets.account-options.view :as account-options] [status-im.contexts.wallet.sheets.network-filter.view :as network-filter] [status-im.contexts.wallet.sheets.select-account.view :as select-account] - [status-im.feature-flags :as ff] [utils.re-frame :as rf])) (defn get-bottom-sheet-args @@ -30,8 +29,7 @@ type :no-title}}] (let [{:keys [color emoji watch-only?]} (rf/sub [:wallet/current-viewing-account]) networks (rf/sub [:wallet/selected-network-details]) - sending-collectible? (rf/sub [:wallet/sending-collectible?]) - keycard? (rf/sub [:wallet/selected-keypair-keycard?])] + sending-collectible? (rf/sub [:wallet/sending-collectible?])] [quo/page-nav {:type type :icon-name icon-name @@ -42,15 +40,10 @@ :networks networks :align-center? true :networks-on-press #(rf/dispatch [:show-bottom-sheet {:content network-filter/view}]) - :right-side [(when (and (ff/enabled? ::ff/wallet.wallet-connect) - (not watch-only?) + :right-side [(when (and (not watch-only?) show-dapps-button?) {:icon-name :i/dapps - :on-press #(rf/dispatch - (if keycard? - [:keycard/feature-unavailable-show - {:feature-name :wallet.show-connected-dapps}] - [:navigate-to :screen/wallet.connected-dapps]))}) + :on-press #(rf/dispatch [:navigate-to :screen/wallet.connected-dapps])}) (when-not sending-collectible? {:content-type :account-switcher :customization-color color diff --git a/src/status_im/contexts/wallet/events.cljs b/src/status_im/contexts/wallet/events.cljs index db34ec30adac..f5fb20e5821a 100644 --- a/src/status_im/contexts/wallet/events.cljs +++ b/src/status_im/contexts/wallet/events.cljs @@ -18,7 +18,6 @@ [status-im.contexts.wallet.item-types :as item-types] [status-im.contexts.wallet.sheets.network-selection.view :as network-selection] [status-im.contexts.wallet.tokens.events] - [status-im.feature-flags :as ff] [taoensso.timbre :as log] [utils.collection] [utils.ethereum.eip.eip55 :as eip55] @@ -573,8 +572,7 @@ [:dispatch [:wallet/get-accounts]] [:dispatch [:wallet/get-keypairs]] [:dispatch [:wallet/get-saved-addresses]] - (when (ff/enabled? ::ff/wallet.wallet-connect) - [:dispatch-later [{:ms 500 :dispatch [:wallet-connect/init]}]])]})) + [:dispatch-later [{:ms 500 :dispatch [:wallet-connect/init]}]]]})) (rf/reg-event-fx :wallet/share-account (fn [_ [{:keys [content title]}]] diff --git a/src/status_im/feature_flags.cljs b/src/status_im/feature_flags.cljs index 23cde910f085..a012865e9043 100644 --- a/src/status_im/feature_flags.cljs +++ b/src/status_im/feature_flags.cljs @@ -29,7 +29,6 @@ ::wallet.import-private-key (enabled-in-env? :FLAG_IMPORT_PRIVATE_KEY_ENABLED) ::wallet.long-press-watch-only-asset (enabled-in-env? :FLAG_LONG_PRESS_WATCH_ONLY_ASSET_ENABLED) ::wallet.saved-addresses (enabled-in-env? :WALLET_SAVED_ADDRESSES) - ::wallet.wallet-connect (enabled-in-env? :FLAG_WALLET_CONNECT_ENABLED) ::wallet.custom-network-amounts (enabled-in-env? :FLAG_WALLET_CUSTOM_NETWORK_AMOUNTS_ENABLED) ::wallet.transaction-params (enabled-in-env? :FLAG_WALLET_TRANSACTION_PARAMS_ENABLED)})