Merge branch 'rifka' into 'master'

tp ro ketinggalan

See merge request !1385

src/container/RollingOutlook/TaxPlanningRO.js

@@ -6080,7 +6080,7 @@ export default class TaxPlanning extends Component {
                                 {/* <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography> */}
                                 <div style={{display: 'flex'}}>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
-                                    <div style={{marginLeft: 10, overflowY: 'scroll', marginTop: 10}}>
+                                    <div style={{marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10}}>
                                         {this.state.updateBy.reverse().map((item,index) => {
                                             return (
                                                 <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>{item.latest_update}</Typography>