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

Revert " Hide browser behind feature flag (#20036)" 

This reverts commit ba3d4dd4ce.
This commit is contained in:
andrey 2024-05-17 12:08:53 +02:00
parent ba3d4dd4ce
commit afd92d2df1
No known key found for this signature in database
GPG Key ID: C20F2FDE9A98BA61
5 changed files with 192 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/legacy/status_im/browser/core.cljs
View File

@ -11,11 +11,9 @@
[legacy.status-im.utils.random :as random] [legacy.status-im.utils.random :as random]
[native-module.core :as native-module] [native-module.core :as native-module]
[re-frame.core :as re-frame] [re-frame.core :as re-frame]
[react-native.core :as react]
[react-native.platform :as platform] [react-native.platform :as platform]
[status-im.common.json-rpc.events :as json-rpc] [status-im.common.json-rpc.events :as json-rpc]
[status-im.common.universal-links :as links] [status-im.common.universal-links :as links]
[status-im.config :as config]
[status-im.constants :as constants] [status-im.constants :as constants]
[status-im.contexts.chat.events :as chat.events] [status-im.contexts.chat.events :as chat.events]
[status-im.navigation.events :as navigation] [status-im.navigation.events :as navigation]
@ -304,7 +302,6 @@
:history [normalized-url]}] :history [normalized-url]}]
(if (links/universal-link? normalized-url) (if (links/universal-link? normalized-url)
{:dispatch [:universal-links/handle-url normalized-url]} {:dispatch [:universal-links/handle-url normalized-url]}
(if config/show-not-implemented-features?
(rf/merge cofx (rf/merge cofx
{:db (assoc db {:db (assoc db
:browser/options :browser/options
@ -314,8 +311,7 @@
(chat.events/close-chat) (chat.events/close-chat)
(navigation/change-tab :browser-stack) (navigation/change-tab :browser-stack)
(update-browser browser) (update-browser browser)
(resolve-url nil)) (resolve-url nil)))))
(.openURL ^js react/linking (url/normalize-url url))))))
(rf/defn open-existing-browser (rf/defn open-existing-browser
"Opens an existing browser with it's history" "Opens an existing browser with it's history"

11
src/legacy/status_im/browser/core_test.cljs
View File

@ -1,5 +1,8 @@
(ns legacy.status-im.browser.core-test (ns legacy.status-im.browser.core-test
(:require (:require
[cljs.test :refer-macros [deftest is testing]]
[legacy.status-im.browser.core :as browser]
[utils.i18n :as i18n]
[utils.url :as url])) [utils.url :as url]))
(defn has-wrong-properties? (defn has-wrong-properties?
@ -18,7 +21,7 @@
(some #(when (= (url/normalize-and-decode-url dapp-url) (first (:history %))) (:browser-id %)) (some #(when (= (url/normalize-and-decode-url dapp-url) (first (:history %))) (:browser-id %))
(vals (get-in result [:db :browser/browsers])))) (vals (get-in result [:db :browser/browsers]))))
#_(deftest browser-test (deftest browser-test
(let [dapp1-url "cryptokitties.co" (let [dapp1-url "cryptokitties.co"
dapp2-url "http://test2.com"] dapp2-url "http://test2.com"]
@ -99,8 +102,7 @@
dapp1-id dapp1-id
{:browser-id dapp1-id {:browser-id dapp1-id
:history-index 0 :history-index 0
:history ["https://cryptokitties.co" :history ["https://cryptokitties.co" dapp1-url2]
dapp1-url2]
:dapp? false :dapp? false
:name (i18n/label :t/browser)})) :name (i18n/label :t/browser)}))
"some properties of the browser are not correct") "some properties of the browser are not correct")
@ -113,8 +115,7 @@
dapp1-id dapp1-id
{:browser-id dapp1-id {:browser-id dapp1-id
:history-index 1 :history-index 1
:history ["https://cryptokitties.co" :history ["https://cryptokitties.co" dapp1-url2]
dapp1-url2]
:dapp? false :dapp? false
:name (i18n/label :t/browser)})) :name (i18n/label :t/browser)}))
"some properties of the browser are not correct")))))))))))) "some properties of the browser are not correct"))))))))))))

10
src/legacy/status_im/browser/permissions_test.cljs
View File

@ -1,6 +1,12 @@
(ns legacy.status-im.browser.permissions-test) (ns legacy.status-im.browser.permissions-test
(:require
[cljs.test :refer-macros [deftest is testing]]
[legacy.status-im.browser.core :as browser]
[legacy.status-im.browser.core-test :as core.tests]
[legacy.status-im.browser.permissions :as permissions]
[legacy.status-im.utils.deprecated-types :as types]))
#_(deftest permissions-test (deftest permissions-test
(let [dapp-name "test.com" (let [dapp-name "test.com"
dapp-name2 "test2.org" dapp-name2 "test2.org"
cofx {:db (assoc-in (:db (browser/open-url {:db {}} dapp-name)) cofx {:db (assoc-in (:db (browser/open-url {:db {}} dapp-name))

6
src/legacy/status_im/ui/components/list_selection.cljs
View File

@ -5,7 +5,6 @@
[legacy.status-im.ui.components.react :as react] [legacy.status-im.ui.components.react :as react]
[re-frame.core :as re-frame] [re-frame.core :as re-frame]
[react-native.platform :as platform] [react-native.platform :as platform]
[status-im.config :as config]
[utils.i18n :as i18n] [utils.i18n :as i18n]
[utils.url :as url])) [utils.url :as url]))
@ -28,9 +27,8 @@
(defn browse (defn browse
[link] [link]
(show {:title (i18n/label :t/browsing-title) (show {:title (i18n/label :t/browsing-title)
:options [(when config/show-not-implemented-features? :options [{:label (i18n/label :t/browsing-open-in-status)
{:label (i18n/label :t/browsing-open-in-status) :action #(re-frame/dispatch [:browser.ui/open-url link])}
:action #(re-frame/dispatch [:browser.ui/open-url link])})
{:label (i18n/label (platform-web-browser)) {:label (i18n/label (platform-web-browser))
:action #(.openURL ^js react/linking (url/normalize-url link))}] :action #(.openURL ^js react/linking (url/normalize-url link))}]
:cancel-text (i18n/label :t/browsing-cancel)})) :cancel-text (i18n/label :t/browsing-cancel)}))

4
src/status_im/contexts/shell/jump_to/components/bottom_tabs/view.cljs
View File

@ -6,7 +6,6 @@
[react-native.gesture :as gesture] [react-native.gesture :as gesture]
[react-native.platform :as platform] [react-native.platform :as platform]
[react-native.reanimated :as reanimated] [react-native.reanimated :as reanimated]
[status-im.config :as config]
[status-im.contexts.shell.jump-to.animation :as animation] [status-im.contexts.shell.jump-to.animation :as animation]
[status-im.contexts.shell.jump-to.components.bottom-tabs.style :as style] [status-im.contexts.shell.jump-to.components.bottom-tabs.style :as style]
[status-im.contexts.shell.jump-to.constants :as shell.constants] [status-im.contexts.shell.jump-to.constants :as shell.constants]
@ -71,5 +70,4 @@
[gesture/gesture-detector {:gesture messages-double-tap-gesture} [gesture/gesture-detector {:gesture messages-double-tap-gesture}
[bottom-tab :i/messages :chats-stack shared-values notifications-data]] [bottom-tab :i/messages :chats-stack shared-values notifications-data]]
[bottom-tab :i/wallet :wallet-stack shared-values notifications-data] [bottom-tab :i/wallet :wallet-stack shared-values notifications-data]
(when config/show-not-implemented-features? [bottom-tab :i/browser :browser-stack shared-values notifications-data]]]]))
[bottom-tab :i/browser :browser-stack shared-values notifications-data])]]]))