ordering-ui-react-native 0.12.32 → 0.12.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.12.32",
+  "version": "0.12.33",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/shared/OButton.tsx

@@ -143,7 +143,6 @@ OButton.defaultProps = {
   isDisabled: false,
   indicatorColor: 'white',
   activeOpacity: 0.5,
-  imgRightSrc: require('../../assets/icons/arrow_right.png'),
 };
 
 export default OButton;

package/themes/uber-eats/src/components/AddressList/index.tsx

@@ -11,7 +11,6 @@ import { NotFoundSource } from '../NotFoundSource'
 import NavBar from '../NavBar'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
 
-const addIcon = require('../../assets/icons/add-circular-outlined-button.png')
 
 const AddressListUI = (props: AddressListParams) => {
   const {
@@ -32,6 +31,7 @@ const AddressListUI = (props: AddressListParams) => {
   } = props
 
   const theme = useTheme()
+  const addIcon = theme.general?.images?.addCircularOutlined
 
   const styles = StyleSheet.create({
     address: {

package/themes/uber-eats/src/components/Messages/index.tsx

@@ -10,9 +10,6 @@ import { TouchableOpacity, ActivityIndicator, StyleSheet, View, Platform, Keyboa
 import { Header, TitleHeader, Wrapper, QuickMessageContainer } from './styles'
 import { MessagesParams } from '../../types'
 
-const ImageDummy = require('../../assets/images/image.png')
-const paperIcon = require('../../assets/images/paper-plane.png')
-
 const ORDER_STATUS: any = {
   0: 'ORDER_STATUS_PENDING',
   1: 'ORDERS_COMPLETED',
@@ -61,8 +58,11 @@ const MessagesUI = (props: MessagesParams) => {
   const [formattedMessages, setFormattedMessages] = useState<Array<any>>([])
   const [isKeyboardShow, setIsKeyboardShow] = useState(false)
   const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
-  const chatDisabled = previousStatus.includes(order?.status)
 
+  const ImageDummy = theme.images?.general?.ImageDummy
+  const paperIcon = theme?.images?.general?.paperIcon
+
+  const chatDisabled = previousStatus.includes(order?.status)
   const quickMessageList = [
     { key: 'customer_message_1', text: t('CUSTOMER_MESSAGE_1', 'customer_message_1') },
     { key: 'customer_message_2', text: t('CUSTOMER_MESSAGE_2', 'customer_message_2') },

package/themes/uber-eats/src/components/shared/OButton.tsx

@@ -128,7 +128,6 @@ OButton.defaultProps = {
   isDisabled: false,
   indicatorColor: 'white',
   activeOpacity: 0.5,
-  imgRightSrc: require('../../assets/icons/arrow_right.png')
 };
 
 export default OButton;

package/themes/uber-eats/src/components/shared/ODropDown.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import styled, { css } from 'styled-components/native'
+import styled, { css, useTheme } from 'styled-components/native'
 import { ScrollView, TouchableOpacity  } from 'react-native-gesture-handler'
 import {
   ScrollView as CustomScrollView,
@@ -76,6 +76,7 @@ const ODropDown = (props: Props) => {
     isModal
   } = props
 
+  const theme = useTheme()
   const [isOpen, setIsOpen] = useState(false)
   const defaultOption = options?.find((option: any) => option.value === defaultValue)
   const [selectedOption, setSelectedOption] = useState<any>(defaultOption)
@@ -114,7 +115,7 @@ const ODropDown = (props: Props) => {
         <DropIcon
           textcolor={props.textcolor}
           secondary={secondary}
-          source={require('../../assets/icons/drop_down.png')}
+          source={theme.images.general.dropDown}
         />
       </Selected>
       {isOpen && options && (

package/themes/uber-eats/src/components/shared/OIcon.tsx

@@ -1,7 +1,7 @@
 
 import * as React from 'react'
 import { ImageStyle } from 'react-native'
-import styled from 'styled-components/native'
+import styled, { useTheme } from 'styled-components/native'
 
 const Wrapper = styled.View``
 
@@ -23,10 +23,11 @@ interface Props {
 }
 
 const OImage = (props: Props): React.ReactElement => {
+  const theme = useTheme()
   return (
     <Wrapper style={{ borderRadius: props.style?.borderRadius, overflow: 'hidden', marginHorizontal: props.style?.marginHorizontal }}>
       <SImage
-        source={props.src ? props.src : props.url ? { uri: props.url } : props.dummy ? props.dummy : require('../../assets/icons/lunch.png')}
+        source={props.src ? props.src : props.url ? { uri: props.url } : props.dummy ? props.dummy : theme.images.general.lunch}
         style={{
           tintColor: props.color,
           flex: props.isWrap ? 1 : 0,