XPS 15 9560 Battery Charging Problem / Error Code: 2000:8138

Hello,

Last week I experienced a problem with the battery (Battery can not be detected), and my laptop was not charging. (The led light on the cable was on but the led light on the laptop turned on and after 5 seconds turned off)

So after taking all the necessarry steps, (checking the battery and BIOS) I figured the solution: I removed the laptop cover, unplugged the battery from the mother board, hit the power for 30 seconds. After doing that, the error message was gone and the laptop seemed fine.

But after that, I faced a new problem. My laptop turns on without a problem, it works fine, when I hit the f2 key at the startup the battery is seen and looks fine, but the new problem is it struggles to charge. When I turn on my laptop the led light on the front turns on and off. After 3-4 attempts of plugging the charger in an out, the led light comes back.

When I run the diagnostics after hitting f12, I get a message about battery life. It says Error Code 2000:8138.

When I checked the code it just says "Your battery appears to be working correctly, it may be software or configuration issue." 

What is the solution here? 
I am so anxious every time I turn on my laptop because I have no idea why it starts charging, it is arbitrary.

I hope someone can help me.

Best,

M.