Skip to content

Commit 9545da7

Browse files
committed
Merge branch 'frontend-watchonly-guide'
2 parents 5883571 + 7e25fe3 commit 9545da7

File tree

5 files changed

+44
-6
lines changed

5 files changed

+44
-6
lines changed

frontends/web/src/locales/en/app.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,10 @@
753753
"text": "Your wallet can manage multiple accounts of the same coin. Accounts are helpful when you want to keep funds separate.",
754754
"title": "What are accounts?"
755755
},
756+
"whatIsRememberWallet": {
757+
"text": "Enabling “Remember wallet” lets you see the accounts for this wallet in the BitBoxApp even when the BitBox02 is not plugged in. This allows you to check your balance and portfolio whenever you want. The BitBox02 still needs to be plugged in and unlocked to send or receive coins.\n\nDisabling “Remember wallet” requires you to plug in the respective BitBox02 (or passphrase wallet) to see those accounts in the BitBoxApp.",
758+
"title": "What happens when I enable/disable “Remember wallet”?"
759+
},
756760
"whyIsThisUseful": {
757761
"text": "Accounts are great for managing funds for different people or purposes because they are separated. You can also share the \"extended public key\" of an account without revealing anything about your other accounts. This allows you to repeatedly receive funds without reusing addresses, such as receiving your wage or regularly buying crypto.",
758762
"title": "Why is this useful?"
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/**
2+
* Copyright 2022 Shift Crypto AG
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
import { useTranslation } from 'react-i18next';
18+
import { Entry } from '../../../components/guide/entry';
19+
import { Guide } from '../../../components/guide/guide';
20+
21+
export const AddAccountGuide = () => {
22+
const { t } = useTranslation();
23+
return (
24+
<Guide>
25+
<Entry key="whatAreAccounts" entry={t('guide.accounts.whatAreAccounts')} />
26+
<Entry key="whyIsThisUseful" entry={t('guide.accounts.whyIsThisUseful')} />
27+
<Entry key="recoverAccounts" entry={t('guide.accounts.recoverAccounts')} />
28+
<Entry key="moveFunds" entry={t('guide.accounts.moveFunds')} />
29+
<Entry key="howtoAddTokens" entry={t('guide.accounts.howtoAddTokens')} />
30+
<Entry key="howManyAccounts" entry={t('guide.accounts.howManyAccounts')} />
31+
</Guide>
32+
);
33+
};

frontends/web/src/routes/account/add/add.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { Header } from '../../../components/layout';
2525
import { Step, Steps } from './components/steps';
2626
import { CoinDropDown } from './components/coin-dropdown';
2727
import { Check } from '../../../components/icon/icon';
28-
import Guide from '../../settings/manage-account-guide';
28+
import { AddAccountGuide } from './add-account-guide';
2929
import { route } from '../../../utils/route';
3030
import { addAccount, CoinCode, TAddAccount } from '../../../api/account';
3131
import styles from './add.module.css';
@@ -260,7 +260,7 @@ export const AddAccount = () => {
260260
</div>
261261
</div>
262262
</div>
263-
<Guide />
263+
<AddAccountGuide />
264264
</div>
265265
);
266266
};

frontends/web/src/routes/settings/manage-account-guide.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ import { useTranslation } from 'react-i18next';
1818
import { Entry } from '../../components/guide/entry';
1919
import { Guide } from '../../components/guide/guide';
2020

21-
export default function BuyGuide() {
21+
export const AccountGuide = () => {
2222
const { t } = useTranslation();
2323
return (
2424
<Guide>
2525
<Entry key="whatAreAccounts" entry={t('guide.accounts.whatAreAccounts')} />
2626
<Entry key="whyIsThisUseful" entry={t('guide.accounts.whyIsThisUseful')} />
27+
<Entry key="whatIsRememberWallet" entry={t('guide.accounts.whatIsRememberWallet')} />
2728
<Entry key="recoverAccounts" entry={t('guide.accounts.recoverAccounts')} />
2829
<Entry key="moveFunds" entry={t('guide.accounts.moveFunds')} />
2930
<Entry key="howtoAddTokens" entry={t('guide.accounts.howtoAddTokens')} />
3031
<Entry key="howManyAccounts" entry={t('guide.accounts.howManyAccounts')} />
3132
</Guide>
3233
);
33-
}
34+
};

frontends/web/src/routes/settings/manage-accounts.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { translate, TranslateProps } from '../../decorators/translate';
3131
import { WithSettingsTabs } from './components/tabs';
3232
import { View, ViewContent } from '../../components/view/view';
3333
import { MobileHeader } from '../settings/components/mobile-header';
34-
import Guide from './manage-account-guide';
34+
import { AccountGuide } from './manage-account-guide';
3535
import style from './manage-accounts.module.css';
3636
import { WatchonlySetting } from './components/manage-accounts/watchonlySetting';
3737

@@ -332,7 +332,7 @@ class ManageAccounts extends Component<Props, State> {
332332
</View>
333333
</Main>
334334
</GuidedContent>
335-
<Guide />
335+
<AccountGuide />
336336
</GuideWrapper>
337337

338338
);

0 commit comments

Comments
 (0)