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

[#9986] Allow to disable fetching of tx history on mobile network

This commit is contained in:
Roman Volosovskyi 2020-07-28 14:10:42 +03:00
parent d22a87b77c
commit c2277cbbe5
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
14 changed files with 142 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.jenkins
View File

@ -21,3 +21,4 @@ STATUS_GO_ENABLE_NIMBUS=0
KEYCARD_TEST_MENU=0
ENABLE_ROOT_ALERT=1
ENABLE_REFERRAL_INVITE=1
DISABLE_WALLET_ON_MOBILE_NETWORK=1

12
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
View File

@ -1099,6 +1099,18 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
Statusgo.appStateChange(type);
}
@ReactMethod
public void stopWallet() {
Log.d(TAG, "StopWallet");
Statusgo.stopWallet();
}
@ReactMethod
public void startWallet() {
Log.d(TAG, "StartWallet");
Statusgo.startWallet();
}
@ReactMethod
public void setBlankPreviewFlag(final Boolean blankPreview) {
final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this.reactContext);

14
modules/react-native-status/ios/RCTStatus/RCTStatus.m
View File

@ -740,6 +740,20 @@ RCT_EXPORT_METHOD(appStateChange:(NSString *)type) {
StatusgoAppStateChange(type);
}
RCT_EXPORT_METHOD(stopWallet) {
#if DEBUG
NSLog(@"StopWallet() method called");
#endif
StatusgoStopWallet();
}
RCT_EXPORT_METHOD(startWallet) {
#if DEBUG
NSLog(@"StartWallet() method called");
#endif
StatusgoStartWallet();
}
RCT_EXPORT_METHOD(setBlankPreviewFlag:(BOOL *)newValue)
{
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];

40
src/status_im/ethereum/subscriptions.cljs
View File

@ -1,6 +1,7 @@
(ns status-im.ethereum.subscriptions
(:require [status-im.ethereum.eip55 :as eip55]
[status-im.wallet.db :as wallet]
[status-im.wallet.core :as wallet.core]
[status-im.ethereum.transactions.core :as transactions]
[status-im.utils.fx :as fx]
[taoensso.timbre :as log]))
@ -59,24 +60,27 @@
(log/debug "[wallet-subs] recent-history-fetching-ended"
"accounts" accounts
"block" blockNumber)
{:db (-> db
(update-in [:wallet :accounts]
wallet/remove-transactions-since-block blockNumber)
(transactions/update-fetching-status accounts :recent? false))
:transactions/get-transfers
{:chain-tokens (:wallet/all-tokens db)
:addresses (reduce
(fn [v address]
(let [normalized-address
(eip55/address->checksum address)]
(if (contains? v normalized-address)
v
(conj v address))))
[]
accounts)
:before-block blockNumber
:limit 20
:historical? true}})
(fx/merge
cofx
{:db (-> db
(update-in [:wallet :accounts]
wallet/remove-transactions-since-block blockNumber)
(transactions/update-fetching-status accounts :recent? false))
:transactions/get-transfers
{:chain-tokens (:wallet/all-tokens db)
:addresses (reduce
(fn [v address]
(let [normalized-address
(eip55/address->checksum address)]
(if (contains? v normalized-address)
v
(conj v address))))
[]
accounts)
:before-block blockNumber
:limit 20
:historical? true}}
(wallet.core/restart-wallet-service)))
(fx/defn new-wallet-event
[cofx {:keys [type blockNumber accounts newTransactions] :as event}]

2
src/status_im/i18n_test.cljs
View File

@ -602,7 +602,7 @@
:message-not-sent
:message-options-cancel
:message-reply
:message-syncing
:data-syncing
:messages
:might-break
:migrations-failed-content

1
src/status_im/multiaccounts/login/core.cljs
View File

@ -284,6 +284,7 @@
;;FIXME
(when nodes
(fleet/set-nodes :eth.contract nodes))
(wallet/restart-wallet-service)
(if login-only?
(login-only-events key-uid password save-password?)
(create-only-events))

8
src/status_im/native_module/core.cljs
View File

@ -263,6 +263,14 @@
(log/debug "[native-module] app-state-change")
(.appStateChange ^js (status) state))
(defn stop-wallet []
(log/debug "[native-module] stop-wallet")
(.stopWallet ^js (status)))
(defn start-wallet []
(log/debug "[native-module] start-wallet")
(.startWallet ^js (status)))
(defn set-blank-preview-flag [flag]
(log/debug "[native-module] set-blank-preview-flag")
(.setBlankPreviewFlag ^js (status) flag))

21
src/status_im/network/net_info.cljs
View File

@ -4,7 +4,8 @@
[status-im.ui.screens.mobile-network-settings.events :as mobile-network]
[status-im.utils.fx :as fx]
[status-im.wallet.core :as wallet]
["@react-native-community/netinfo" :default net-info]))
["@react-native-community/netinfo" :default net-info]
[taoensso.timbre :as log]))
(fx/defn change-network-status
[{:keys [db] :as cofx} is-connected?]
@ -24,13 +25,21 @@
(fx/defn handle-network-info-change
{:events [::network-info-changed]}
[{:keys [db] :as cofx} {:keys [isConnected type details] :as state}]
(let [old-network-status (:network-status db)
old-network-type (:network/type db)
connectivity-status (if isConnected :online :offline)]
(let [old-network-status (:network-status db)
old-network-type (:network/type db)
connectivity-status (if isConnected :online :offline)
status-changed? (= connectivity-status old-network-status)
type-changed? (= type old-network-type)]
(log/debug "[net-info]"
"old-network-status" old-network-status
"old-network-type" old-network-type
"connectivity-status" connectivity-status
"type" type
"details" details)
(fx/merge cofx
(when-not (= connectivity-status old-network-status)
(when-not status-changed?
(change-network-status isConnected))
(when-not (= type old-network-type)
(when-not type-changed?
(change-network-type old-network-type type (:is-connection-expensive details))))))
(defn add-net-info-listener []

4
src/status_im/subs.cljs
View File

@ -60,6 +60,7 @@
;;general
(reg-root-key-sub :sync-state :sync-state)
(reg-root-key-sub :network-status :network-status)
(reg-root-key-sub :network/type :network/type)
(reg-root-key-sub :peers-count :peers-count)
(reg-root-key-sub :about-app/node-info :node-info)
(reg-root-key-sub :peers-summary :peers-summary)
@ -153,7 +154,8 @@
(reg-root-key-sub :wallet.transactions :wallet.transactions)
(reg-root-key-sub :wallet/custom-token-screen :wallet/custom-token-screen)
(reg-root-key-sub :wallet/prepare-transaction :wallet/prepare-transaction)
(reg-root-key-sub :wallet-service/manual-setting :wallet-service/manual-setting)
(reg-root-key-sub :wallet-service/state :wallet-service/state)
;;commands
(reg-root-key-sub :commands/select-account :commands/select-account)

19
src/status_im/ui/screens/mobile_network_settings/events.cljs
View File

@ -3,11 +3,13 @@
[status-im.utils.handlers :as handlers]
[status-im.multiaccounts.update.core :as multiaccounts.update]
[status-im.utils.fx :as fx]
[status-im.wallet.core :as wallet]
[status-im.ui.components.bottom-sheet.core :as bottom-sheet]
[status-im.multiaccounts.model :as multiaccounts.model]
[status-im.navigation :as navigation]
[status-im.mailserver.core :as mailserver]
[status-im.ui.screens.mobile-network-settings.utils :as utils]))
[status-im.ui.screens.mobile-network-settings.utils :as utils]
[taoensso.timbre :as log]))
(fx/defn sheet-defaults
[{:keys [db]}]
@ -34,7 +36,8 @@
logged-in?
[(mailserver/process-next-messages-request)
(bottom-sheet/hide-bottom-sheet)]))))
(bottom-sheet/hide-bottom-sheet)
(wallet/restart-wallet-service)]))))
(defn apply-settings
([sync?] (apply-settings sync? :default))
@ -44,7 +47,12 @@
remember-choice?
(if (not= :default remember?)
remember?
(:mobile-network/remember-choice? db))]
(:mobile-network/remember-choice? db))
cellular? (utils/cellular? network)]
(log/info "apply mobile network settings"
"sunc?" sync?
"remember?" remember?
"cellular?" cellular?)
(fx/merge
cofx
(multiaccounts.update/multiaccount-update
@ -52,8 +60,9 @@
(multiaccounts.update/multiaccount-update
:remember-syncing-choice? (boolean remember-choice?) {})
(bottom-sheet/hide-bottom-sheet)
(when (and (utils/cellular? network) sync?)
(mailserver/process-next-messages-request)))))))
(when (and cellular? sync?)
(mailserver/process-next-messages-request))
(wallet/restart-wallet-service))))))
(handlers/register-handler-fx
:mobile-network/continue-syncing

2
src/status_im/ui/screens/sync_settings/views.cljs
View File

@ -13,7 +13,7 @@
[react/view {:style {:flex 1 :background-color colors/white}}
[topbar/topbar {:title (i18n/label :t/sync-settings)}]
[react/scroll-view
[quo/list-header (i18n/label :t/message-syncing)]
[quo/list-header (i18n/label :t/data-syncing)]
[quo/list-item {:size :small
:title (i18n/label :t/mobile-network-settings)
:accessibility-label :notifications-button

45
src/status_im/wallet/core.cljs
View File

@ -25,7 +25,9 @@
[status-im.ethereum.stateofus :as stateofus]
[status-im.ui.components.bottom-sheet.core :as bottom-sheet]
[status-im.wallet.prices :as prices]
[status-im.wallet.utils :as wallet.utils]))
[status-im.wallet.utils :as wallet.utils]
[status-im.native-module.core :as status]
[status-im.ui.screens.mobile-network-settings.utils :as mobile-network-utils]))
(defn get-balance
[{:keys [address on-success on-error]}]
@ -593,3 +595,44 @@
:cancel-button-text (i18n/label :t/no)
:on-accept #(re-frame/dispatch [:wallet.accounts/delete-account account])
:on-cancel #()}})
(re-frame/reg-fx
::stop-wallet
(fn []
(log/info "stop-wallet fx")
(status/stop-wallet)))
(re-frame/reg-fx
::start-wallet
(fn []
(log/info "start-wallet fx")
(status/start-wallet)))
(fx/defn stop-wallet
[{:keys [db] :as cofx}]
(let []
{:db (assoc db :wallet-service/state :stopped)
::stop-wallet nil}))
(fx/defn start-wallet
[{:keys [db] :as cofx}]
(let []
{:db (assoc db :wallet-service/state :started)
::start-wallet nil}))
(fx/defn restart-wallet-service
[{:keys [db] :as cofx}]
(when (:multiaccount db)
(let [state (:wallet-service/state db)
syncing-allowed? (mobile-network-utils/syncing-allowed? cofx)]
(log/info "restart-wallet-service"
"syncing-allowed" syncing-allowed?
"state" state)
(cond
(and (not syncing-allowed?)
(not= state :stopped))
(stop-wallet cofx)
(and syncing-allowed?
(not= state :started))
(start-wallet cofx)))))

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im",
"repo": "status-go",
"version": "v0.56.6",
"commit-sha1": "2d0818d873fee570a73867d8ed4bc8e792215cf1",
"src-sha256": "0d9k0c2srhmm5dpzx3dkzn1h0p60x9zwjzim6x08gp9yd87h3zmv"
"version": "stop-wallet",
"commit-sha1": "08d4f2e422ca3de0b639022baf840bebdb5bd67b",
"src-sha256": "1k16fhr6hrmxv47jpwhlj164blf20sq96gba4378vmpzhakqk266"
}

6
translations/en.json
View File

@ -692,7 +692,7 @@
"message-not-sent": "Message not sent",
"message-options-cancel": "Cancel",
"message-reply": "Reply",
"message-syncing": "Message syncing",
"data-syncing": "Data syncing",
"messages": "Messages",
"chat-is-a-contact": "Contact",
"chat-is-not-a-contact": "Not a contact",
@ -712,9 +712,9 @@
"mobile-network-stop-syncing": "Stop syncing",
"mobile-network-stop-syncing-details": "Until connected to Wi-Fi?",
"mobile-network-use-mobile": "Use mobile data",
"mobile-network-use-mobile-data": "Status uses a lot of data when syncing chats.",
"mobile-network-use-mobile-data": "Status uses a lot of data when syncing chats and wallet.",
"mobile-network-use-wifi": "Wi-Fi only",
"mobile-syncing-sheet-details": "Status uses a lot of data when syncing chats.",
"mobile-syncing-sheet-details": "Status uses a lot of data when syncing chats and wallet.",
"mobile-syncing-sheet-title": "Sync using mobile data?",
"more": "more",
"multiaccount-exists-title": "Keys for this account already exist",