[FIX] Fix loading state when adding GBI gateway
[FIX] Pull-request comments
Merge pull request #1629 from mrajvanshy/fix/gbi

[FIX] Fix loading state when adding GBI gateway