Fix wait banner (keybase#20592)

* fix wait banner

* tweaks on troubleshooting screen

* lint

* storybook

* prettier

shared/provision/code-page/index.tsx

@@ -225,7 +225,8 @@ class CodePage2 extends React.Component<Props, State> {
         <Kb.BannerParagraph
           bannerColor="yellow"
           content={[
-            `Wait, I'm on that ${this.props.otherDeviceType === 'mobile' ? 'phone' : 'computer'} right now!`,
+            `Are you on that ${this.props.otherDeviceType === 'mobile' ? 'phone' : 'computer'} now? `,
+            {onClick: () => this.setState({troubleshooting: true}), text: 'Resolve'},
           ]}
         />
       </Kb.Banner>

shared/provision/troubleshooting/index.tsx

@@ -74,7 +74,7 @@ const Troubleshooting = (props: Props) => {
     <Kb.Modal
       onClose={onBack}
       header={{
-        hideBorder: true,
+        hideBorder: false,
         leftButton: Styles.isMobile ? (
           <Kb.Text type="BodySemiboldLink" onClick={onBack}>
             Back
@@ -94,8 +94,8 @@ const Troubleshooting = (props: Props) => {
       mode="Wide"
     >
       <Kb.Box2 direction="vertical" gap="small" alignItems="center">
-        <Kb.Box2 direction="vertical">
-          <Kb.Text type="Body" center={true} style={styles.bodyMargins}>
+        <Kb.Box2 direction="vertical" style={styles.bodyMargins}>
+          <Kb.Text type="Body" center={true}>
             This appears to be a new {Styles.isMobile ? 'phone' : 'computer'}. Perhaps you restored from a
             backup or uninstalled Keybase. Either way, Keybase keys aren’t backed up, so this is now a totally
             new device.
@@ -154,6 +154,9 @@ const styles = Styles.styleSheetCreate(() => ({
   },
   bodyMargins: Styles.platformStyles({
     isElectron: Styles.padding(Styles.globalMargins.medium, Styles.globalMargins.xlarge, 0),
+    isMobile: {
+      padding: Styles.globalMargins.medium,
+    },
   }),
   buttonBar: {
     marginLeft: Styles.globalMargins.medium,

shared/settings/feedback/index.tsx

@@ -129,7 +129,7 @@ class Feedback extends React.Component<Props, State> {
               <Kb.Box2 direction="horizontal" fullWidth={true}>
                 <Kb.NewInput
                   containerStyle={styles.input}
-                  placeholder="Email (pretty please!)"
+                  placeholder="Your email address"
                   onChangeText={this._onChangeEmail}
                 />
               </Kb.Box2>
@@ -172,7 +172,10 @@ const styles = Styles.styleSheetCreate(
         isElectron: {padding: Styles.globalMargins.tiny},
         isMobile: {...Styles.padding(Styles.globalMargins.tiny, Styles.globalMargins.small)},
       }),
-      mainBox: {padding: Styles.globalMargins.small},
+      mainBox: Styles.platformStyles({
+        common: {padding: Styles.globalMargins.small},
+        isElectron: {width: 368},
+      }),
       outerStyle: {backgroundColor: Styles.globalColors.white},
       smallLabel: {color: Styles.globalColors.black},
     } as const)