[ PrimalHQ/primal-ios-app ] Merge pull request #172 from PrimalHQ/2.5-fixes

2.5 fixes

https://github.com/PrimalHQ/primal-ios-app/commit/21bb16c0204f46c418aaf9565e061c767545a5d1