Skip to content

Commit 71b0868

Browse files
committed
extract some inline expressions into variables for cleaner code
1 parent c829505 commit 71b0868

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

source/views/menus/components/filter-menu-toolbar.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ export function FilterMenuToolbar({date, title, filters, onPress}: PropsType) {
2727
const appliedFilterCount = filters
2828
.filter(f => f.type !== 'picker')
2929
.filter(f => f.enabled).length
30+
3031
const isFiltered = appliedFilterCount > 0
32+
const filterWord = appliedFilterCount === 1 ? 'Filter' : 'Filters'
3133

3234
return (
3335
<Toolbar onPress={onPress}>
@@ -41,11 +43,7 @@ export function FilterMenuToolbar({date, title, filters, onPress}: PropsType) {
4143
<ToolbarButton
4244
isActive={isFiltered}
4345
title={
44-
isFiltered
45-
? `${appliedFilterCount} ${appliedFilterCount === 1
46-
? 'Filter'
47-
: 'Filters'}`
48-
: 'No Filters'
46+
isFiltered ? `${appliedFilterCount} ${filterWord}` : 'No Filters'
4947
}
5048
iconName={Platform.OS === 'ios' ? 'ios-funnel' : 'md-funnel'}
5149
/>

source/views/transportation/bus/index.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,10 @@ export default class BusView extends React.Component {
4646
const activeBusLine = busLines.find(({line}) => line === this.props.line)
4747

4848
if (!activeBusLine) {
49+
const {line} = this.props
50+
const lines = busLines.map(({line}) => line).join(', ')
4951
return (
50-
<NoticeView
51-
text={`The line "${this.props
52-
.line}" was not found among ${busLines
53-
.map(({line}) => line)
54-
.join(', ')}`}
55-
/>
52+
<NoticeView text={`The line "${line}" was not found among ${lines}`} />
5653
)
5754
}
5855

source/views/transportation/otherModes.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,13 @@ export default function OtherModesView() {
4343
{data.description}
4444
</Text>
4545
<Button
46-
onPress={() =>
47-
trackedOpenUrl({
46+
onPress={() => {
47+
const modeName = data.name.replace(' ', '')
48+
return trackedOpenUrl({
4849
url: data.url,
49-
id: `Transportation_OtherModes_${data.name.replace(
50-
' ',
51-
'',
52-
)}View`,
53-
})}
50+
id: `Transportation_OtherModes_${modeName}View`,
51+
})
52+
}}
5453
title="More info"
5554
/>
5655
</View>}

0 commit comments

Comments
 (0)