Merge something_unit and something_value props to one prop with value and unit

Summary

There are several keys with names like target_amount_value and target_amount_unit, i.e., keys that describe the value and the unit of the same property. Currently, they are saved into two different props with the same name. It would be nice to have one property, e.g. target_amount instead, the value and unit of which is filled from the two keys.

Expected Behavior

One prop with value and unit.

Actual Behavior

Two independent props, one with value target_amount_value, the other with value target_amount_unit.