Update mapping logic

Valentino Međimorecrequested to merge
issue/commerce_revolut-3579465:3579465-fix-the-payment into 1.x

Closes #3579465

Merge request reports