British Expats - Category B Income calculation

Hi guys I am new here and I have some concerns regarding my application and not knowing whether I have any chance of approval is killing me.

I applied online 17/04/2018 and the biometrics were done on 09/05/2018 and my solicitor told me to gather all my financial documents between the application online and biometrics which I did. Now I have read that any financial documents after the online application date 17/04/2018 won't be considered.

This means that my payslip on 30/04/2018 won't be counted and this has angered me a lot that a solicitor could be so stupid like that.

So basically I did some of my own calculation and I wanted to know if I am still on the safe side of things.

Basically I understand that under category B I have to meet 2 parts of which (1) I have to be earning £1550+ per month at the date of application and (2) 12 months prior to date of online application I have to have £18,600+.

(1) I meet this part as I am earning more than £1550 per month at the date of online application and can be seen on my payslip for month ending 30 March 2018 which is less than 28 days prior to 17/04/2018. ( I started this employment on 1st March 2018)

(2) I have been in non-salaried income up until 28 Feb 2018 and my pay starting with my payslip for week ending 22/04/2017 should be counted right?

If this is true then the income I received between 17/04/2017 to 17/04/2018 is £18,869.35

Also the bank statements I provided them in original were issued on 24th April 2018 but the financial date included on them is between Mar 2017 to May 2018.

So can anyone comment on my situation I am really stressing out.