Fix wallet transaction scanning
merge