Minor refactor - resolve-import-cycle

[theamanjs]

          @theamanjs veerji, why do we need to disable this linting rule? Couldn't find any new import with this PR.

Other than that, looks good to me.

Originally posted by @Gauravjeetsingh in https://github.com/KhalisFoundation/sttm-desktop/pull/1792#discussion_r1250369232