fix(Copy): SFOX first step

blockchain · May 31, 2018 · 44b0dbd · 44b0dbd
1 parent ce24867
commit 44b0dbd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/SfoxExchangeData/Create/VerifyEmail.js b/packages/blockchain-wallet-v4-frontend/src/modals/SfoxExchangeData/Create/VerifyEmail.js
@@ -77,7 +77,7 @@ class VerifyEmail extends Component {
               <FormattedMessage id='sfoxexchangedata.create.verifyemail.partner.header' defaultMessage="What's your email?" />
             </PartnerHeader>
             <PartnerSubHeader>
-              <FormattedMessage id='sfoxexchangedata.create.verifyemail.partner.subheader' defaultMessage="Enter the email address you would like to use with your SFOX account. We'll send you a verification code to make sure it's yours." />
+              <FormattedMessage id='sfoxexchangedata.create.verifyemail.partner.subheader' defaultMessage="Rest assured: there are only a few steps separating you from the good stuff. Let's start by confirming your verified email address and phone number." />
             </PartnerSubHeader>
             {
               ui.create === 'enter_email_code'

diff --git a/...-v4-frontend/src/scenes/SecurityCenter/Advanced/SecondPasswordWallet/Settings/template.js b/...-v4-frontend/src/scenes/SecurityCenter/Advanced/SecondPasswordWallet/Settings/template.js
@@ -91,13 +91,8 @@ const Settings = (props) => {
               <Button nature='empty' capitalize onClick={handleCancel}>
                 <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.cancel2' defaultMessage='Cancel' />
               </Button>
-<<<<<<< HEAD
               <Button nature='primary' capitalize disabled={submitting || invalid} onClick={handleSubmit}>
                 <FormattedMessage id='scenes.securitysettings.advanced.secondpasswordwallet.settings.save2' defaultMessage='Save' />
-=======
-              <Button type='submit' nature='primary' capitalize disabled={submitting || invalid}>
-                <FormattedMessage id='scenes.securitysettings.basicsecurity.secondpasswordwallet.settings.save2' defaultMessage='Save' />
->>>>>>> development
               </Button>
             </ButtonWrapper>
           </SettingForm>