fix(messenger): android crash multiple blur view

Signed-off-by: clegirar <clemntgirard@gmail.com>
moul · Apr 15, 2021 · 85e4e0b · 85e4e0b
1 parent ae18bb9
commit 85e4e0b
Show file tree

Hide file tree

Showing 14 changed files with 375 additions and 323 deletions.
diff --git a/js/package.json b/js/package.json
diff --git a/js/packages/components/chat/MultiMember.tsx b/js/packages/components/chat/MultiMember.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
 import { TouchableOpacity, View, Platform } from 'react-native'
 import { Text, Icon } from '@ui-kitten/components'
+import { BlurView } from '@react-native-community/blur'
 import { CommonActions } from '@react-navigation/native'
 import { useTranslation } from 'react-i18next'
 import EmojiBoard from 'react-native-emoji-board'
@@ -18,7 +19,6 @@ import {
 import beapi from '@berty-tech/api'
 
 import { ChatFooter, ChatDate } from './common'
-import BlurView from '../shared-components/BlurView'
 import { SwipeNavRecognizer } from '../shared-components/SwipeNavRecognizer'
 import { useLayout } from '../hooks'
 import { MultiMemberAvatar } from '../avatars'
@@ -46,6 +46,7 @@ const HeaderMultiMember: React.FC<{
 	return (
 		<View style={{ position: 'absolute', top: 0, left: 0, right: 0 }} onLayout={onLayoutHeader}>
 			<BlurView
+				overlayColor=''
 				blurType='light'
 				blurAmount={30}
 				style={{ position: 'absolute', bottom: 0, top: 0, left: 0, right: 0 }}

diff --git a/js/packages/components/chat/OneToOne.tsx b/js/packages/components/chat/OneToOne.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react'
 import { ActivityIndicator, Platform, StyleSheet, TouchableOpacity, View } from 'react-native'
+import { BlurView } from '@react-native-community/blur'
 import { Icon, Text } from '@ui-kitten/components'
 import { CommonActions } from '@react-navigation/native'
 import { useTranslation } from 'react-i18next'
@@ -18,7 +19,6 @@ import {
 	useNotificationsInhibitor,
 } from '@berty-tech/store/hooks'
 
-import BlurView from '../shared-components/BlurView'
 import { ContactAvatar } from '../avatars'
 import { useLayout } from '../hooks'
 import { ChatDate, ChatFooter } from './common'
@@ -62,6 +62,7 @@ export const ChatHeader: React.FC<{ convPk: any; stickyDate: any; showStickyDate
 	return (
 		<View style={{ position: 'absolute', top: 0, left: 0, right: 0 }} onLayout={onLayoutHeader}>
 			<BlurView
+				overlayColor=''
 				blurType='light'
 				blurAmount={30}
 				style={{ position: 'absolute', bottom: 0, top: 0, left: 0, right: 0 }}