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

Fixed regression when sending transaction 

Remove obsolete realm
This commit is contained in:
Julien Eluard 2017-11-29 16:59:01 +01:00 committed by Jan Herich
parent c6f44cc852
commit 7f2085fb14
9 changed files with 12 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/status_im/chat/events.cljs
View File

@ -6,8 +6,7 @@
[status-im.chat.models :as model]
[status-im.chat.models.unviewed-messages :as unviewed-messages-model]
[status-im.chat.sign-up :as sign-up]
[status-im.chat.constants :as chat-const]
[status-im.data-store.handler-data :as handler-data]
[status-im.chat.constants :as chat-const]
[status-im.data-store.messages :as msg-store]
[status-im.data-store.contacts :as contacts-store]
[status-im.data-store.chats :as chats-store]
@ -202,8 +201,7 @@
:requests (get chat->message-id->request chat-id))]))
(into {}))]
(-> new-db
(assoc-in [:message-data :preview] message-previews)
(assoc :handler-data (handler-data/get-all))
(assoc-in [:message-data :preview] message-previews)
(assoc :chats chats)
init-console-chat
(update :dispatch-n conj event)))))))

3
src/status_im/chat/specs.cljs
View File

@ -10,8 +10,7 @@
(s/def :chat/chat-list-ui-props (s/nilable map?))
(s/def :chat/layout-height (s/nilable number?)) ;;height of chat's view layout
(s/def :chat/expandable-view-height-to-value (s/nilable number?))
(s/def :chat/loading-allowed (s/nilable boolean?)) ;;allow to load more messages
(s/def :chat/handler-data (s/nilable map?))
(s/def :chat/loading-allowed (s/nilable boolean?)) ;;allow to load more messages
(s/def :chat/message-data (s/nilable map?))
(s/def :chat/message-id->transaction-id (s/nilable map?))
(s/def :chat/message-status (s/nilable map?))

10
src/status_im/data_store/commands.cljs
View File

@ -1,10 +0,0 @@
(ns status-im.data-store.commands
(:require [status-im.data-store.realm.commands :as data-store]))
(defn get-by-chat-id
[chat-id]
(data-store/get-by-chat-id chat-id))
(defn save
[command]
(data-store/save command))

16
src/status_im/data_store/handler_data.cljs
View File

@ -1,16 +0,0 @@
(ns status-im.data-store.handler-data
(:require [cljs.reader :as reader]
[status-im.data-store.realm.handler-data :as data-store]
[taoensso.timbre :as log]))
(defn get-all []
(->> (data-store/get-all-as-list)
(map (fn [{:keys [message-id data]}]
[message-id (reader/read-string data)]))
(into {})))
(defn get-data [message-id]
(-> message-id data-store/get-by-message-id :data reader/read-string))
(defn save-data [handler-data]
(data-store/save (update handler-data :data pr-str)))

11
src/status_im/data_store/realm/commands.cljs
View File

@ -1,11 +0,0 @@
(ns status-im.data-store.realm.commands
(:require [status-im.data-store.realm.core :as realm]))
(defn get-by-chat-id
[chat-id]
(realm/get-one-by-field-clj @realm/account-realm :command
:chat-id chat-id))
(defn save
[command]
(realm/save @realm/account-realm :command command true))

16
src/status_im/data_store/realm/handler_data.cljs
View File

@ -1,16 +0,0 @@
(ns status-im.data-store.realm.handler-data
(:require [status-im.data-store.realm.core :as realm]))
(defn get-all []
(realm/get-all @realm/account-realm :handler-data))
(defn get-all-as-list []
(realm/js-object->clj (get-all)))
(defn get-by-message-id
[message-id]
(realm/get-one-by-field-clj @realm/account-realm :handler-data :message-id message-id))
(defn save
[handler-data]
(realm/save @realm/account-realm :handler-data handler-data true))

20
src/status_im/data_store/realm/schemas/account/v19/core.cljs
View File

@ -1,11 +1,8 @@
(ns status-im.data-store.realm.schemas.account.v19.core
(:require [status-im.data-store.realm.schemas.account.v11.chat :as chat]
[status-im.data-store.realm.schemas.account.v1.chat-contact :as chat-contact]
[status-im.data-store.realm.schemas.account.v6.command :as command]
[status-im.data-store.realm.schemas.account.v9.command-parameter :as command-parameter]
[status-im.data-store.realm.schemas.account.v1.chat-contact :as chat-contact]
[status-im.data-store.realm.schemas.account.v19.contact :as contact]
[status-im.data-store.realm.schemas.account.v1.discover :as discover]
[status-im.data-store.realm.schemas.account.v1.kv-store :as kv-store]
[status-im.data-store.realm.schemas.account.v1.discover :as discover]
[status-im.data-store.realm.schemas.account.v10.message :as message]
[status-im.data-store.realm.schemas.account.v12.pending-message :as pending-message]
[status-im.data-store.realm.schemas.account.v1.processed-message :as processed-message]
@ -14,18 +11,14 @@
[status-im.data-store.realm.schemas.account.v1.user-status :as user-status]
[status-im.data-store.realm.schemas.account.v5.contact-group :as contact-group]
[status-im.data-store.realm.schemas.account.v5.group-contact :as group-contact]
[status-im.data-store.realm.schemas.account.v8.local-storage :as local-storage]
[status-im.data-store.realm.schemas.account.v13.handler-data :as handler-data]
[status-im.data-store.realm.schemas.account.v8.local-storage :as local-storage]
[taoensso.timbre :as log]
[cljs.reader :as reader]))
(def schema [chat/schema
chat-contact/schema
command/schema
command-parameter/schema
chat-contact/schema
contact/schema
discover/schema
kv-store/schema
discover/schema
message/schema
pending-message/schema
processed-message/schema
@ -34,8 +27,7 @@
user-status/schema
contact-group/schema
group-contact/schema
local-storage/schema
handler-data/schema])
local-storage/schema])
(defn remove-contact! [new-realm whisper-identity]
(when-let [contact (some-> new-realm

6
src/status_im/data_store/realm/schemas/base/v4/core.cljs
View File

@ -1,12 +1,10 @@
(ns status-im.data-store.realm.schemas.base.v4.core
(:require [status-im.data-store.realm.schemas.base.v4.network :as network]
[status-im.data-store.realm.schemas.base.v4.account :as account]
[status-im.data-store.realm.schemas.base.v1.kv-store :as kv-store]
[status-im.data-store.realm.schemas.base.v4.account :as account]
[taoensso.timbre :as log]))
(def schema [network/schema
account/schema
kv-store/schema])
account/schema])
(defn migration [old-realm new-realm]
(log/debug "migrating v4 base database: " old-realm new-realm)

3
src/status_im/ui/screens/db.cljs
View File

@ -163,8 +163,7 @@
:chat/command-hash-valid?
:chat/public-group-topic
:chat/confirmation-code-sms-listener
:chat/messages
:chat/handler-data
:chat/messages
:chat/loaded-chats
:chat/raw-unviewed-messages
:chat/bot-db