From 158df06d5c56cf61b9cda713c84605742ef73d7c Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Thu, 18 Oct 2018 12:47:29 -0300 Subject: [PATCH] [FIX] OAuth (#496) --- app/views/OAuthView.js | 6 ++---- package-lock.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/OAuthView.js b/app/views/OAuthView.js index 113b1c90..f9fcff4a 100644 --- a/app/views/OAuthView.js +++ b/app/views/OAuthView.js @@ -5,7 +5,6 @@ import { connect } from 'react-redux'; import RocketChat from '../lib/rocketchat'; import I18n from '../i18n'; -import { iconsMap } from '../Icons'; const userAgentAndroid = 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1'; const userAgent = Platform.OS === 'ios' ? 'UserAgent' : userAgentAndroid; @@ -16,9 +15,8 @@ const userAgent = Platform.OS === 'ios' ? 'UserAgent' : userAgentAndroid; export default class OAuthView extends React.PureComponent { static navigatorButtons = { leftButtons: [{ - id: 'close', - title: I18n.t('Close'), - icon: Platform.OS === 'android' ? iconsMap.close : undefined + id: 'cancel', + title: I18n.t('Cancel') }] } diff --git a/package-lock.json b/package-lock.json index c6fc6c36..b2b6b214 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2154,7 +2154,7 @@ "integrity": "sha512-iOD1PRnTSVr9sDWQdesIpfRrwJhHfeEQe5BpalQxC5OhM9thpiE6cu2NlW1KBWl0RJG4ZiJaF1xLlCo9YxU6dA==" }, "@rocket.chat/sdk": { - "version": "git+https://github.com/RocketChat/Rocket.Chat.js.SDK.git#0db179f062719119cfe3fad1f7d6c2f1a4a896bf", + "version": "git+https://github.com/RocketChat/Rocket.Chat.js.SDK.git#0814dfc3650476801590d3fd8517632ef50b158c", "from": "git+https://github.com/RocketChat/Rocket.Chat.js.SDK.git#ddp", "requires": { "@types/lru-cache": "^4.1.0",