rem a comment

app/javascript/glitch/components/status/container.js

@@ -102,16 +102,6 @@ const makeMapStateToProps = () => {
   const mapStateToProps = (state, ownProps) => {
 
     let status = getStatus(state, ownProps.id);
-
-    if(status === null) {
-      console.error(`ERROR! NULL STATUS! ${ownProps.id}`);
-      // work-around: find first good status
-      for (let k of state.get('statuses').keys()) {
-        status = getStatus(state, k);
-        if (status !== null) break;
-      }
-    }
-
     let reblogStatus = status.get('reblog', null);
     let account = undefined;
     let prepend = undefined;

app/javascript/mastodon/features/compose/components/compose_form.js

@@ -247,7 +247,6 @@ export default class ComposeForm extends ImmutablePureComponent {
           <UploadFormContainer />
         </div>
 
-        <div className='compose-form__buttons-wrapper'>
         <div className='compose-form__buttons'>
           <UploadButtonContainer />
           <DoodleButtonContainer />
@@ -279,7 +278,6 @@ export default class ComposeForm extends ImmutablePureComponent {
           </div>
         </div>
       </div>
-      </div>
     );
   }
 

app/javascript/styles/components.scss

@@ -302,7 +302,6 @@
   font-family: inherit;
   font-size: 14px;
   background: $simple-background-color;
-  border-radius: 0 0 4px;
 }
 
 .compose-form__buttons-wrapper {
@@ -452,6 +451,7 @@
 
 .compose-form__publish {
   display: flex;
+  justify-content: flex-end;
   min-width: 0;
 }