Merge branch 'main' into candidate

This commit is contained in:
xmflsct 2022-12-24 14:46:58 +01:00
commit e006e5a1a2
2 changed files with 23 additions and 24 deletions

View File

@ -1,30 +1,29 @@
module.exports = function (api) {
api.cache(false)
const plugins = [
'@babel/plugin-proposal-optional-chaining',
[
'module-resolver',
{
root: ['./'],
alias: {
'@assets': './assets',
'@root': './src',
'@api': './src/api',
'@helpers': './src/helpers',
'@components': './src/components',
'@screens': './src/screens',
'@utils': './src/utils'
}
}
],
'react-native-reanimated/plugin'
]
if (process.env.NODE_ENV === 'production' || process.env.BABEL_ENV === 'production') {
plugins.push('transform-remove-console')
}
return {
presets: ['babel-preset-expo'],
plugins: [
'@babel/plugin-proposal-optional-chaining',
[
'module-resolver',
{
root: ['./'],
alias: {
'@assets': './assets',
'@root': './src',
'@api': './src/api',
'@helpers': './src/helpers',
'@components': './src/components',
'@screens': './src/screens',
'@utils': './src/utils'
}
}
],
'react-native-reanimated/plugin'
]
}
return { presets: ['babel-preset-expo'], plugins }
}

View File

@ -258,7 +258,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
<HeaderRight
type='text'
content={t(
`heading.right.button.${
`screenCompose:heading.right.button.${
(params?.type &&
(params.type === 'conversation'
? params.visibility === 'direct'
@ -266,7 +266,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
: 'default'
: params.type)) ||
'default'
}` as any
}`
)}
onPress={() => {
composeDispatch({ type: 'posting', payload: true })