Skip to content

Commit 31613d0

Browse files
BytesOfManBytesOfMan
committed
[Cashtab] Change route and component for SendToken to Token
Summary: T3528 This is no longer really a "SendToken" component. Send is one of many token actions available. Going forward, will eventually support loading any token at this route. Some unsupported tokens will not have available actions. Token is a more appropriate name. Update the component name and the route. Continue to support the legacy 'send-token' route in case someone direct navigates. Move from "components/Send/" to "components/Etokens/" Test Plan: `npm test` Reviewers: #bitcoin_abc, emack Reviewed By: #bitcoin_abc, emack Differential Revision: https://reviews.bitcoinabc.org/D15992
1 parent 0a2e431 commit 31613d0

File tree

7 files changed

+29
-26
lines changed

7 files changed

+29
-26
lines changed

‎cashtab/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cashtab/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cashtab",
3-
"version": "2.32.0",
3+
"version": "2.32.1",
44
"private": true,
55
"scripts": {
66
"start": "node scripts/start.js",

‎cashtab/src/components/App/App.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import Home from 'components/Home/Home';
2424
import Receive from 'components/Receive/Receive';
2525
import CreateToken from 'components/Etokens/CreateToken';
2626
import SendXec from 'components/Send/SendXec';
27-
import SendToken from 'components/Send/SendToken';
27+
import Token from 'components/Etokens/Token';
2828
import Airdrop from 'components/Airdrop/Airdrop';
2929
import BackupWallet from 'components/BackupWallet/BackupWallet';
3030
import Contacts from 'components/Contacts';
@@ -318,10 +318,16 @@ const App = () => {
318318
path="/send"
319319
element={<SendXec />}
320320
/>
321-
<Route path="send-token">
321+
<Route path="/send-token">
322322
<Route
323323
path=":tokenId"
324-
element={<SendToken />}
324+
element={<Token />}
325+
/>
326+
</Route>
327+
<Route path="/token">
328+
<Route
329+
path=":tokenId"
330+
element={<Token />}
325331
/>
326332
</Route>
327333
<Route

‎cashtab/src/components/Etokens/CreateTokenForm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ const CreateTokenForm = () => {
150150
return;
151151
}
152152
if (typeof tokens.get(createdTokenId) !== 'undefined') {
153-
navigate(`/send-token/${createdTokenId}`);
153+
navigate(`/token/${createdTokenId}`);
154154
}
155155
}, [createdTokenId, tokens]);
156156

‎cashtab/src/components/Send/SendToken.js ‎cashtab/src/components/Etokens/Token.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ const AliasAddressPreviewLabel = styled.div`
141141
white-space: nowrap;
142142
`;
143143

144-
const SendToken = () => {
144+
const Token = () => {
145145
let navigate = useNavigate();
146146
const { apiError, cashtabState, chronik, chaintipBlockheight, loading } =
147147
React.useContext(WalletContext);
@@ -1121,4 +1121,4 @@ const SendToken = () => {
11211121
);
11221122
};
11231123

1124-
export default SendToken;
1124+
export default Token;

‎cashtab/src/components/Etokens/TokenList.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ const TokenLink = styled(Link)`
1515

1616
const TokenList = ({ tokens, tokenCache, userLocale }) => {
1717
return Array.from(tokens).map(keyValueArray => (
18-
<TokenLink
19-
key={keyValueArray[0]}
20-
to={`/send-token/${keyValueArray[0]}`}
21-
>
18+
<TokenLink key={keyValueArray[0]} to={`/token/${keyValueArray[0]}`}>
2219
<TokenListItem
2320
tokenId={keyValueArray[0]}
2421
balance={decimalizedTokenQtyToLocaleFormat(

‎cashtab/src/components/Send/__tests__/SendToken.test.js ‎cashtab/src/components/Etokens/__tests__/Token.test.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ describe('<SendToken />', () => {
127127
render(
128128
<CashtabTestWrapper
129129
chronik={mockedChronik}
130-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
130+
route={`/token/${SEND_TOKEN_TOKENID}`}
131131
/>,
132132
);
133133

@@ -158,7 +158,7 @@ describe('<SendToken />', () => {
158158
render(
159159
<CashtabTestWrapper
160160
chronik={mockedChronik}
161-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
161+
route={`/token/${SEND_TOKEN_TOKENID}`}
162162
/>,
163163
);
164164

@@ -187,7 +187,7 @@ describe('<SendToken />', () => {
187187
render(
188188
<CashtabTestWrapper
189189
chronik={mockedChronik}
190-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
190+
route={`/token/${SEND_TOKEN_TOKENID}`}
191191
/>,
192192
);
193193

@@ -217,7 +217,7 @@ describe('<SendToken />', () => {
217217
render(
218218
<CashtabTestWrapper
219219
chronik={mockedChronik}
220-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
220+
route={`/token/${SEND_TOKEN_TOKENID}`}
221221
/>,
222222
);
223223

@@ -275,7 +275,7 @@ describe('<SendToken />', () => {
275275
render(
276276
<CashtabTestWrapper
277277
chronik={mockedChronik}
278-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
278+
route={`/token/${SEND_TOKEN_TOKENID}`}
279279
/>,
280280
);
281281

@@ -298,7 +298,7 @@ describe('<SendToken />', () => {
298298
render(
299299
<CashtabTestWrapper
300300
chronik={mockedChronik}
301-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
301+
route={`/token/${SEND_TOKEN_TOKENID}`}
302302
/>,
303303
);
304304

@@ -323,7 +323,7 @@ describe('<SendToken />', () => {
323323
render(
324324
<CashtabTestWrapper
325325
chronik={mockedChronik}
326-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
326+
route={`/token/${SEND_TOKEN_TOKENID}`}
327327
/>,
328328
);
329329

@@ -368,7 +368,7 @@ describe('<SendToken />', () => {
368368
render(
369369
<CashtabTestWrapper
370370
chronik={mockedChronik}
371-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
371+
route={`/token/${SEND_TOKEN_TOKENID}`}
372372
/>,
373373
);
374374

@@ -406,7 +406,7 @@ describe('<SendToken />', () => {
406406
render(
407407
<CashtabTestWrapper
408408
chronik={mockedChronik}
409-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
409+
route={`/token/${SEND_TOKEN_TOKENID}`}
410410
/>,
411411
);
412412

@@ -442,7 +442,7 @@ describe('<SendToken />', () => {
442442
render(
443443
<CashtabTestWrapper
444444
chronik={mockedChronik}
445-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
445+
route={`/token/${SEND_TOKEN_TOKENID}`}
446446
/>,
447447
);
448448

@@ -484,7 +484,7 @@ describe('<SendToken />', () => {
484484
render(
485485
<CashtabTestWrapper
486486
chronik={mockedChronik}
487-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
487+
route={`/token/${SEND_TOKEN_TOKENID}`}
488488
/>,
489489
);
490490

@@ -550,7 +550,7 @@ describe('<SendToken />', () => {
550550
render(
551551
<CashtabTestWrapper
552552
chronik={mockedChronik}
553-
route={`/send-token/${SEND_TOKEN_TOKENID}`}
553+
route={`/token/${SEND_TOKEN_TOKENID}`}
554554
/>,
555555
);
556556

@@ -656,7 +656,7 @@ describe('<SendToken />', () => {
656656
render(
657657
<CashtabTestWrapper
658658
chronik={mintMockedChronik}
659-
route={`/send-token/${mockTokenId}`}
659+
route={`/token/${mockTokenId}`}
660660
/>,
661661
);
662662

0 commit comments

Comments
 (0)