(Chore) Type fixes and refactor

[fernandomg]

While debugging for #1375 found some snippets of code that require types. Also, did a slight refactor in a couple of files.

This shouldn't affect the functionality, just the code.

[github-actions]

CLA Assistant Lite All Contributors have signed the CLA.

[github-actions]

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type	Occurrences	Fixable
Errors	0	0
Warnings	0	0
Ignored	1	N/A

• Result: ✅ success
• Annotations: 0 total

---

^{Report generated by eslint-plus-action}

[ghost]

Travis automatic deployment:
https://pr1376--safereact.review.gnosisdev.com/app

[ghost]

Travis automatic deployment:
https://pr1376--safereact.review.gnosisdev.com/app

[ghost]

Travis automatic deployment:
https://pr1376--safereact.review.gnosisdev.com/app

[ghost]

Travis automatic deployment:
https://pr1376--safereact.review.gnosisdev.com/app

[dasanra]

This were only some code refactor and styles improvement. No QA is required