Convert this [TODO](https://github.com/dotkernel/frontend/commit/1ddda22231f48387568e956bf670811252c3ef25#diff-0c9333350bcfc0bf5bde27b14c09779f1fa88dcd83d3e1601879e4257cf7c7f9R18) reported by @MarioRadu to an issue.
