@@ -40,15 +40,19 @@ function TagGLCodePage({route, policyTags}: EditTagGLCodePageProps) {
40
40
const { tags} = PolicyUtils . getTagList ( policyTags , orderWeight ) ;
41
41
const glCode = tags ?. [ route . params . tagName ] ?. [ 'GL Code' ] ;
42
42
43
+ const goBack = useCallback ( ( ) => {
44
+ Navigation . goBack ( ROUTES . WORKSPACE_TAG_SETTINGS . getRoute ( route . params . policyID , orderWeight , tagName ) ) ;
45
+ } , [ orderWeight , route . params . policyID , tagName ] ) ;
46
+
43
47
const editGLCode = useCallback (
44
48
( values : FormOnyxValues < typeof ONYXKEYS . FORMS . WORKSPACE_TAG_FORM > ) => {
45
49
const newGLCode = values . glCode . trim ( ) ;
46
50
if ( newGLCode !== glCode ) {
47
51
Tag . setPolicyTagGLCode ( route . params . policyID , tagName , orderWeight , newGLCode ) ;
48
52
}
49
- Navigation . goBack ( ROUTES . WORKSPACE_TAG_SETTINGS . getRoute ( route . params . policyID , orderWeight , tagName ) ) ;
53
+ goBack ( ) ;
50
54
} ,
51
- [ glCode , route . params . policyID , tagName , orderWeight ] ,
55
+ [ glCode , route . params . policyID , tagName , orderWeight , goBack ] ,
52
56
) ;
53
57
54
58
return (
@@ -65,7 +69,7 @@ function TagGLCodePage({route, policyTags}: EditTagGLCodePageProps) {
65
69
>
66
70
< HeaderWithBackButton
67
71
title = { translate ( 'workspace.tags.glCode' ) }
68
- onBackButtonPress = { ( ) => Navigation . goBack ( ) }
72
+ onBackButtonPress = { goBack }
69
73
/>
70
74
< FormProvider
71
75
formID = { ONYXKEYS . FORMS . WORKSPACE_TAG_FORM }
0 commit comments