Skip to content

Add loading animation to swap processing step #33

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 2 commits into from
May 11, 2020
Merged

Add loading animation to swap processing step #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee926b
feat: add lottie loading animation to swap wizard
jamaljsr May 8, 2020
dbd188b
refactor: fix typo in i18n lang keys
jamaljsr May 8, 2020
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
2 changes: 2 additions & 0 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"emotion-theming": "10.0.27",
"i18next": "19.4.4",
"i18next-browser-languagedetector": "4.1.1",
"lottie-web": "5.6.8",
"mobx": "5.15.4",
"mobx-react-lite": "2.0.6",
"react": "^16.13.1",
Expand Down Expand Up @@ -58,6 +59,7 @@
"eslint-plugin-prettier": "3.1.3",
"eslint-plugin-react": "7.19.0",
"google-protobuf": "3.11.4",
"jest-canvas-mock": "2.2.0",
"jest-environment-jsdom-sixteen": "1.0.3",
"node-sass": "4.14.1",
"prettier": "2.0.5",
Expand Down
4 changes: 2 additions & 2 deletions app/src/__tests__/components/loop/LoopPage.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe('LoopPage component', () => {
fireEvent.click(getByText('Next'));
expect(getByText('Step 2 of 2')).toBeInTheDocument();
fireEvent.click(getByText('Confirm'));
expect(getByText(/Swap Processing/)).toBeInTheDocument();
expect(getByText('Configuring Loops')).toBeInTheDocument();
await waitFor(() => {
expect(grpcMock.unary).toHaveBeenCalledWith(
expect.objectContaining({ methodName: 'LoopOut' }),
Expand All @@ -128,7 +128,7 @@ describe('LoopPage component', () => {
fireEvent.click(getByText('Next'));
expect(getByText('Step 2 of 2')).toBeInTheDocument();
fireEvent.click(getByText('Confirm'));
expect(getByText(/Swap Processing/)).toBeInTheDocument();
expect(getByText('Configuring Loops')).toBeInTheDocument();
expect(store.buildSwapStore.processingTimeout).toBeDefined();
fireEvent.click(getByText('arrow-left.svg'));
expect(getByText('Review the quote')).toBeInTheDocument();
Expand Down
4 changes: 2 additions & 2 deletions app/src/__tests__/components/loop/SwapWizard.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('SwapWizard component', () => {
fireEvent.click(getByText('Next'));
expect(getByText('Step 2 of 2')).toBeInTheDocument();
fireEvent.click(getByText('Confirm'));
expect(getByText(/Swap Processing/)).toBeInTheDocument();
expect(getByText('Configuring Loops')).toBeInTheDocument();
fireEvent.click(getByText('arrow-left.svg'));
expect(getByText('Step 2 of 2')).toBeInTheDocument();
fireEvent.click(getByText('arrow-left.svg'));
Expand Down Expand Up @@ -128,7 +128,7 @@ describe('SwapWizard component', () => {

it('should display the description label', () => {
const { getByText } = renderWrap();
expect(getByText(/Swap Processing/)).toBeInTheDocument();
expect(getByText('Configuring Loops')).toBeInTheDocument();
});

it('should display an error message', () => {
Expand Down
322 changes: 322 additions & 0 deletions app/src/assets/animations/loading.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,322 @@
{
"v": "4.6.3",
"fr": 29.9700012207031,
"ip": 0,
"op": 35.0000014255792,
"w": 400,
"h": 400,
"nm": "Comp 1",
"ddd": 0,
"assets": [],
"layers": [
{
"ddd": 0,
"ind": 1,
"ty": 4,
"nm": "Shape Layer 1",
"ks": {
"o": { "a": 0, "k": 100 },
"r": { "a": 0, "k": 0 },
"p": { "a": 0, "k": [200, 205, 0] },
"a": { "a": 0, "k": [0, 0, 0] },
"s": { "a": 0, "k": [77.411, 77.411, 100] }
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": { "a": 0, "k": [288.949, 288.949] },
"p": { "a": 0, "k": [0, 0] },
"nm": "Ellipse Path 1",
"mn": "ADBE Vector Shape - Ellipse"
},
{
"ty": "tm",
"s": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [-2.959] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_-2p959_0p333_0"],
"t": 0,
"s": [6],
"e": [7.98]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0.226] },
"n": ["0p667_1_0p333_0p226"],
"t": 4,
"s": [7.98],
"e": [34]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 7,
"s": [34],
"e": [54]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 12,
"s": [54],
"e": [100]
},
{
"i": { "x": [0.667], "y": [0.667] },
"o": { "x": [0.333], "y": [0.333] },
"n": ["0p667_0p667_0p333_0p333"],
"t": 19,
"s": [100],
"e": [100]
},
{ "t": 35.0000014255792 }
],
"ix": 1
},
"e": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 0,
"s": [0],
"e": [47]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 24,
"s": [47],
"e": [92]
},
{ "t": 35.0000014255792 }
],
"ix": 2
},
"o": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 0,
"s": [-70],
"e": [46]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 7,
"s": [46],
"e": [115]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 12,
"s": [115],
"e": [144]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 19,
"s": [144],
"e": [173]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 24,
"s": [173],
"e": [309]
},
{ "t": 35.0000014255792 }
],
"ix": 3
},
"m": 1,
"ix": 2,
"nm": "Trim Paths 1",
"mn": "ADBE Vector Filter - Trim"
},
{
"ty": "st",
"c": { "a": 0, "k": [0, 0.6784313725490196, 0.7764705882352941, 1] },
"o": { "a": 0, "k": 100 },
"w": { "a": 0, "k": 14 },
"lc": 2,
"lj": 1,
"ml": 4,
"nm": "Stroke 1",
"mn": "ADBE Vector Graphic - Stroke"
},
{
"ty": "tr",
"p": { "a": 0, "k": [2.549, -5.717], "ix": 2 },
"a": { "a": 0, "k": [0, 0], "ix": 1 },
"s": { "a": 0, "k": [108.139, 108.139], "ix": 3 },
"r": { "a": 0, "k": 0, "ix": 6 },
"o": { "a": 0, "k": 100, "ix": 7 },
"sk": { "a": 0, "k": 0, "ix": 4 },
"sa": { "a": 0, "k": 0, "ix": 5 },
"nm": "Transform"
}
],
"nm": "big_circle",
"np": 4,
"cix": 2,
"ix": 1,
"mn": "ADBE Vector Group"
},
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": { "a": 0, "k": [288.949, 288.949] },
"p": { "a": 0, "k": [0, 0] },
"nm": "Ellipse Path 1",
"mn": "ADBE Vector Shape - Ellipse"
},
{
"ty": "tm",
"s": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 1,
"s": [0],
"e": [22.284]
},
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 15,
"s": [22.284],
"e": [84]
},
{ "t": 35.0000014255792 }
],
"ix": 1
},
"e": {
"a": 1,
"k": [
{
"i": { "x": [0.667], "y": [1] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p667_1_0p333_0"],
"t": 0,
"s": [13],
"e": [100]
},
{
"i": { "x": [0.667], "y": [0.667] },
"o": { "x": [0.333], "y": [0.333] },
"n": ["0p667_0p667_0p333_0p333"],
"t": 15,
"s": [100],
"e": [100]
},
{
"i": { "x": [0.667], "y": [0.667] },
"o": { "x": [0.333], "y": [0.333] },
"n": ["0p667_0p667_0p333_0p333"],
"t": 29,
"s": [100],
"e": [100]
},
{ "t": 35.0000014255792 }
],
"ix": 2
},
"o": {
"a": 1,
"k": [
{
"i": { "x": [0.833], "y": [0.833] },
"o": { "x": [0.333], "y": [0] },
"n": ["0p833_0p833_0p333_0"],
"t": 1,
"s": [-22],
"e": [11]
},
{
"i": { "x": [0.833], "y": [0.833] },
"o": { "x": [0.167], "y": [0.167] },
"n": ["0p833_0p833_0p167_0p167"],
"t": 33,
"s": [11],
"e": [22]
},
{ "t": 35.0000014255792 }
],
"ix": 3
},
"m": 1,
"ix": 2,
"nm": "Trim Paths 1",
"mn": "ADBE Vector Filter - Trim"
},
{
"ty": "st",
"c": { "a": 0, "k": [0, 0.4117647058823529, 0.6941176470588235, 1] },
"o": { "a": 0, "k": 100 },
"w": { "a": 0, "k": 19 },
"lc": 2,
"lj": 1,
"ml": 4,
"nm": "Stroke 1",
"mn": "ADBE Vector Graphic - Stroke"
},
{
"ty": "tr",
"p": { "a": 0, "k": [2.549, -5.717], "ix": 2 },
"a": { "a": 0, "k": [0, 0], "ix": 1 },
"s": { "a": 0, "k": [72.226, 72.226], "ix": 3 },
"r": { "a": 0, "k": 0, "ix": 6 },
"o": { "a": 0, "k": 100, "ix": 7 },
"sk": { "a": 0, "k": 0, "ix": 4 },
"sa": { "a": 0, "k": 0, "ix": 5 },
"nm": "Transform"
}
],
"nm": "small_circle",
"np": 4,
"cix": 2,
"ix": 2,
"mn": "ADBE Vector Group"
}
],
"ip": 0,
"op": 900.000036657751,
"st": 0,
"bm": 0,
"sr": 1
}
]
}
Loading