Skip to content

fix: #5798 #5814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 18, 2021
Merged

fix: #5798 #5814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e298363
fix: #5798
shivam-51 Nov 17, 2021
b647b8a
fix: #5798
shivam-51 Nov 17, 2021
cccd23d
Merge branch 'issue-5798' of https://github.com/shivam-51/community-a…
shivam-51 Nov 17, 2021
8d9a79a
fix: #5798
shivam-51 Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions __tests__/shared/components/Settings/Account/__snapshots__/index.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ exports[`renders account setting page correctly 1`] = `
<SideBar
icons={
Object {
"linked accounts": <LinkedAccountIcon
height="30"
viewBox="0 0 30 30"
width="30"
xmlns="http://www.w3.org/2000/svg"
/>,
"my account": <MyAccountIcon
height="30"
viewBox="0 0 30 30"
Expand All @@ -27,7 +21,6 @@ exports[`renders account setting page correctly 1`] = `
names={
Array [
"my account",
"linked account",
]
}
/>
Expand Down
2 changes: 1 addition & 1 deletion __tests__/shared/components/Settings/Account/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const settingsUI = {
TABS: {
ACCOUNT: {
MYACCOUNT: 'my account',
LINKEDACCOUNT: 'linked account',
// LINKEDACCOUNT: 'linked account',
},
},
};
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/Settings/Account/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import _ from 'lodash';

import Accordion from 'components/Settings/Accordion';
import MyAccountIcon from 'assets/images/account/sideicons/myaccount.svg';
import LinkedAccountIcon from 'assets/images/account/sideicons/linkedaccount.svg';
// import LinkedAccountIcon from 'assets/images/account/sideicons/linkedaccount.svg';
import ErrorWrapper from 'components/Settings/ErrorWrapper';
import SideBar from '../SideBar';
import ComingSoon from '../ComingSoon';
Expand Down Expand Up @@ -74,7 +74,7 @@ export default class Account extends React.Component {
const currentTab = this.tablink || settingsUI.currentAccountTab;
const icons = {
'my account': <MyAccountIcon />,
'linked accounts': <LinkedAccountIcon />,
// 'linked accounts': <LinkedAccountIcon />,
};
const renderTabContent = (tab) => {
switch (tab) {
Expand Down
2 changes: 1 addition & 1 deletion src/shared/reducers/page/ui/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const TABS = {
},
ACCOUNT: {
MYACCOUNT: 'my account',
LINKEDACCOUNT: 'linked accounts',
// LINKEDACCOUNT: 'linked accounts',
},
};

Expand Down