Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
bgptr committed Oct 20, 2020
1 parent fa27ecd commit 72bebcd
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ const Tutorial = () => {
const [tutorialStep, setTutorialStep] = useState(0);

const onNextTutorialStep = useCallback(() => {
/* istanbul ignore else */
if (tutorialStep + 1 <= 3) {
setTutorialStep(tutorialStep + 1);
}
}, [tutorialStep]);

/*
* comment out this function because it not used
* commented out this function because it not used
*
const onPrevTutorialStep = useCallback(() => {
if (tutorialStep - 1 >= 0) {
Expand Down
1 change: 0 additions & 1 deletion app/components/views/GetStartedPage/hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ export const useGetStarted = () => {
syncDaemon,
onOpenWallet,
goToHome,
onOpenWallet,
onShowTutorial,
appVersion
} = useDaemonStartup();
Expand Down
4 changes: 0 additions & 4 deletions app/components/views/HelpPage/LogsTab/LogsTab.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,15 @@ class LogsTabBody extends React.Component {
const dcrdLogs = Buffer.from(rawDcrdLogs).toString("utf8");
const dcrwalletLogs = Buffer.from(rawDcrwalletLogs).toString("utf8");
const dcrlndLogs = Buffer.from(rawDcrlndLogs).toString("utf8");
/* istanbul ignore else */
if (dcrdLogs !== this.state.dcrdLogs) {
this.setState({ dcrdLogs });
}
/* istanbul ignore else */
if (dcrwalletLogs !== this.state.dcrwalletLogs) {
this.setState({ dcrwalletLogs });
}
/* istanbul ignore else */
if (decreditonLogs !== this.state.decreditonLogs) {
this.setState({ decreditonLogs });
}
/* istanbul ignore else */
if (dcrlndLogs !== this.state.dcrlndLogs) {
this.setState({ dcrlndLogs });
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ test("pasting invalid seed words on existing seed view", async () => {

firePasteEvent(screen.getAllByRole("combobox")[0], testSeedMnemonic);
await wait(() => screen.getByText(/Error: seed is not valid./i));
screen.debug();
});

test("pasting valid seed words on existing seed view and receive decode error and create wallet request error", async () => {
Expand Down
11 changes: 3 additions & 8 deletions test/unit/components/views/GetStaredPage/WalletSelection.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ beforeEach(() => {
isTrezor: true
},
finished: true,
lastAccess: testLastAccessNow
lastAccess: testLastAccessOneHourAgo
},
{
label: "test-privacy-wallet",
Expand All @@ -67,7 +67,7 @@ beforeEach(() => {
isPrivacy: true
},
finished: true,
lastAccess: testLastAccessNow
lastAccess: testLastAccessOneHourAgo
},
{
label: "test-watch-only-wallet",
Expand All @@ -76,7 +76,7 @@ beforeEach(() => {
},
finished: true,
isWatchingOnly: true,
lastAccess: testLastAccessNow
lastAccess: testLastAccessOneHourAgo
}
];

Expand Down Expand Up @@ -133,15 +133,13 @@ test("render wallet chooser view", async () => {
// check trezor wallet
const trezorWallet = screen.getByText(testAvailableWallets[2].value.wallet);
expect(trezorWallet).toBeInTheDocument();
expect(trezorWallet.nextSibling.textContent).toMatch(/last accessed: now/i);
expect(trezorWallet.previousSibling.previousSibling.textContent).toMatch(
/trezor/i
);

// check privacy wallet
const privacyWallet = screen.getByText(testAvailableWallets[3].value.wallet);
expect(privacyWallet).toBeInTheDocument();
expect(privacyWallet.nextSibling.textContent).toMatch(/Last accessed: now/i);
expect(privacyWallet.previousSibling.previousSibling.textContent).toMatch(
/privacy/i
);
Expand All @@ -151,9 +149,6 @@ test("render wallet chooser view", async () => {
testAvailableWallets[4].value.wallet
);
expect(watchOnlyWallet).toBeInTheDocument();
expect(watchOnlyWallet.nextSibling.textContent).toMatch(
/last accessed: now/i
);
expect(watchOnlyWallet.previousSibling.previousSibling.textContent).toMatch(
/watch only/i
);
Expand Down

0 comments on commit 72bebcd

Please sign in to comment.