@@ -144,6 +144,7 @@ function filterOutRangesWithCorrectValue(
144144 currencyList : SharedValue < string [ ] > ,
145145 categoryList : SharedValue < string [ ] > ,
146146 tagList : SharedValue < string [ ] > ,
147+ currentType : string ,
147148) {
148149 'worklet' ;
149150
@@ -196,6 +197,9 @@ function filterOutRangesWithCorrectValue(
196197 case CONST . SEARCH . SYNTAX_FILTER_KEYS . TAG :
197198 return tagList . get ( ) . includes ( range . value ) ;
198199 case CONST . SEARCH . SYNTAX_ROOT_KEYS . GROUP_BY :
200+ if ( currentType !== CONST . SEARCH . DATA_TYPES . EXPENSE && currentType !== CONST . SEARCH . DATA_TYPES . INVOICE && currentType !== CONST . SEARCH . DATA_TYPES . TRIP ) {
201+ return false ;
202+ }
199203 return groupByList . includes ( range . value ) ;
200204 case CONST . SEARCH . SYNTAX_FILTER_KEYS . BILLABLE :
201205 case CONST . SEARCH . SYNTAX_FILTER_KEYS . REIMBURSABLE :
@@ -246,8 +250,11 @@ function parseForLiveMarkdown(
246250
247251 const parsedAutocomplete = parse ( input ) as SearchAutocompleteResult ;
248252 const ranges = parsedAutocomplete . ranges ;
253+ const typeRange = ranges . find ( ( range ) => range . key === CONST . SEARCH . SYNTAX_ROOT_KEYS . TYPE ) ;
254+ const currentType = typeRange ?. value ?? CONST . SEARCH . DATA_TYPES . EXPENSE ;
255+
249256 return ranges
250- . filter ( ( range ) => filterOutRangesWithCorrectValue ( range , map , userLogins , currencyList , categoryList , tagList ) )
257+ . filter ( ( range ) => filterOutRangesWithCorrectValue ( range , map , userLogins , currencyList , categoryList , tagList , currentType ) )
251258 . map ( ( range ) => {
252259 const isCurrentUserMention = userLogins . get ( ) . includes ( range . value ) || range . value === currentUserName || range . value === CONST . SEARCH . ME ;
253260 const type = isCurrentUserMention ? 'mention-here' : 'mention-user' ;
0 commit comments