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

[#6402]: "div() not a number: null" error after connecting to Ropsten and opening Wallet 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Aleksandr Pantiukhov 2018-10-19 10:02:35 +02:00 committed by Andrey Shovkoplyas
parent e2533e9964
commit d7b4e04efd
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/status_im/network/core.cljs
View File

@ -114,7 +114,7 @@
(accounts.update/account-update (accounts.update/account-update
{:network network-id {:network network-id
:last-updated now} :last-updated now}
{})) {:success-event [:accounts.update.callback/save-settings-success]}))
(fx/merge cofx (fx/merge cofx
{:ui/show-confirmation {:title (i18n/label :t/close-app-title) {:ui/show-confirmation {:title (i18n/label :t/close-app-title)
:content (i18n/label :t/close-app-content) :content (i18n/label :t/close-app-content)
@ -136,13 +136,16 @@
:id 1}) :id 1})
:opts {:headers {"Content-Type" "application/json"}} :opts {:headers {"Content-Type" "application/json"}}
:success-event-creator (fn [{:keys [response-body]}] :success-event-creator (fn [{:keys [response-body]}]
(let [client-version (:result (http/parse-payload response-body))] (if-let [client-version (:result (http/parse-payload response-body))]
[::connect-success {:network-id network-id [::connect-success {:network-id network-id
:on-success on-success :on-success on-success
:client-version client-version}])) :client-version client-version}]
[::connect-failure {:network-id network-id
:on-failure on-failure
:reason (i18n/label :t/network-invalid-url)}]))
:failure-event-creator (fn [{:keys [response-body status-code]}] :failure-event-creator (fn [{:keys [response-body status-code]}]
(let [reason (if status-code (let [reason (if status-code
(str "Got a wrong status code: " status-code) (i18n/label :t/network-invalid-status-code {:code status-code})
(str response-body))] (str response-body))]
[::connect-failure {:network-id network-id [::connect-failure {:network-id network-id
:on-failure on-failure :on-failure on-failure

6
src/status_im/ui/screens/views.cljs
View File

@ -164,7 +164,8 @@
:new-public-chat new-public-chat :new-public-chat new-public-chat
:open-dapp open-dapp :open-dapp open-dapp
:dapp-description dapp-description :dapp-description dapp-description
:browser browser} :browser browser
:login login}
:config :config
{:headerMode "none" {:headerMode "none"
:initialRouteName "home"}} :initialRouteName "home"}}
@ -237,7 +238,8 @@
:config {:headerMode "none"}} :config {:headerMode "none"}}
:unsigned-transactions wallet-transactions/transactions :unsigned-transactions wallet-transactions/transactions
:transactions-history wallet-transactions/transactions :transactions-history wallet-transactions/transactions
:wallet-transaction-details wallet-transactions/transaction-details}) :wallet-transaction-details wallet-transactions/transaction-details
:login login})
{:headerMode "none" {:headerMode "none"
:initialRouteName "wallet"})} :initialRouteName "wallet"})}
:wallet-settings-assets :wallet-settings-assets

4
translations/en.json
View File

@ -751,5 +751,7 @@
"share-link": "Share link", "share-link": "Share link",
"share-profile-link": "Share profile link", "share-profile-link": "Share profile link",
"share-public-chat-text": "Check out this public chat on the Status app: {{link}}", "share-public-chat-text": "Check out this public chat on the Status app: {{link}}",
"share-dapp-text": "Check out this DApp I'm using on Status: {{link}}" "share-dapp-text": "Check out this DApp I'm using on Status: {{link}}",
"network-invalid-url": "Network URL is invalid",
"network-invalid-status-code": "Invalid status code: {{code}}"
} }