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 desktop build 

Signed-off-by: Volodymyr Kozieiev <vkjr.sp@gmail.com>
This commit is contained in:
Volodymyr Kozieiev 2019-07-12 16:31:45 +03:00
parent 5a02074426
commit b71e37d8ab
No known key found for this signature in database
GPG Key ID: 1F706640AAF07516
3 changed files with 511 additions and 1585 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop_files/package.json.orig
View File

@ -68,7 +68,7 @@
"querystring-es3": "0.2.1",
"react": "16.6.1",
"react-dom": "16.4.2",
"react-native": "git+https://github.com/status-im/react-native-desktop.git#v0.57.8_8",
"react-native": "git+https://github.com/status-im/react-native-desktop.git#v0.57.8_10",
"react-native-background-timer": "2.0.0",
"react-native-camera": "0.10.0",
"react-native-config": "git+https://github.com/status-im/react-native-config.git#v0.11.2-status",

2089
desktop_files/yarn.lock
View File

File diff suppressed because it is too large Load Diff

5
src/status_im/ui/screens/desktop/main/tabs/home/views.cljs
View File

@ -55,8 +55,9 @@
:number-of-lines 1
:style (styles/chat-name current?)}
name]]
(let [uri (contenthash/url (:content last-message))]
(if (and uri (= constants/content-type-sticker (:content-type last-message)))
(let [is-sticker? (= constants/content-type-sticker (:content-type last-message))
uri (if is-sticker? (contenthash/url (get-in last-message [:content :hash])) nil)]
(if uri
[react/image {:style {:margin 2 :width 30 :height 30}
:source {:uri uri}}]
[react/text {:ellipsize-mode :tail