Skip to content
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

4127: send to address #4137

Merged
merged 12 commits into from
Nov 21, 2023
Merged

4127: send to address #4137

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ceb53a1
wip: refactor send page for send via address
L03TJ3 Nov 16, 2023
0b3bdc2
fix: full flow sendViaAddress
L03TJ3 Nov 16, 2023
a952fc1
Merge branch 'master' of github.com:GoodDollar/GoodDAPP into 4127-sen…
L03TJ3 Nov 17, 2023
8245996
fix: some styles, add success icon
L03TJ3 Nov 17, 2023
b5d8baa
fix: not needed sendViaAddress check
L03TJ3 Nov 17, 2023
f68ac96
add: new fontello past icon, adjust address input styles
L03TJ3 Nov 17, 2023
d3236a1
fix: align new amount screen for isNativeFlow, fix showing cancel/nex…
L03TJ3 Nov 17, 2023
17bbbf9
Merge branch 'master' of github.com:GoodDollar/GoodDAPP into 4127-sen…
L03TJ3 Nov 17, 2023
d8d4d00
fix: snaps
L03TJ3 Nov 17, 2023
c4152eb
fix: old yarnrc conf file
L03TJ3 Nov 20, 2023
e4f7e61
Merge branch 'master' of github.com:GoodDollar/GoodDAPP into 4127-sen…
L03TJ3 Nov 21, 2023
8b8e0ed
fix: add inputWithAddons to support 2 icons + isNativeFlow fixes
L03TJ3 Nov 21, 2023
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
106 changes: 57 additions & 49 deletions src/assets/fonts/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
{
"uid": "8c802a14f77dea3dc02419584c942c70",
"css": "link",
"code": 59392,
"code": 59393,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -205,7 +205,7 @@
{
"uid": "1692d179ac2d54092854f0999d74036e",
"css": "arrow-down",
"code": 59393,
"code": 59394,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -219,7 +219,7 @@
{
"uid": "991d995828300aa242720d329a7e42b4",
"css": "arrow-up",
"code": 59394,
"code": 59395,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -289,7 +289,7 @@
{
"uid": "6813ca14115f77f449d2a2d3d961e57c",
"css": "arrow-back",
"code": 59395,
"code": 59396,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -303,7 +303,7 @@
{
"uid": "0ef77ca722d925a88e3a6c303f426d34",
"css": "lock",
"code": 59396,
"code": 59397,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -373,7 +373,7 @@
{
"uid": "0a60a377c3e8b7ab05dce66e4d4b8603",
"css": "arrow-up-circle",
"code": 59397,
"code": 59398,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -387,7 +387,7 @@
{
"uid": "1b02d0b1b2201e9507feb650165a3285",
"css": "exchange",
"code": 59398,
"code": 59399,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -457,7 +457,7 @@
{
"uid": "d981b3b38e4f0c88ce37c550796935db",
"css": "cake",
"code": 59399,
"code": 59400,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -471,7 +471,7 @@
{
"uid": "b6c2a3aa44468deec00ee65d165544b4",
"css": "camera",
"code": 59400,
"code": 59401,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -527,7 +527,7 @@
{
"uid": "54fc75218d35d5df058c9ca642ae15a7",
"css": "ios-share",
"code": 59401,
"code": 59402,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -541,7 +541,7 @@
{
"uid": "5223606f9c2ff365f559c2a6e8424bcb",
"css": "profile",
"code": 59402,
"code": 59403,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -625,7 +625,7 @@
{
"uid": "5583f70c05043ef39f41efd72133675e",
"css": "bonus-reward",
"code": 59403,
"code": 59404,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -639,7 +639,7 @@
{
"uid": "d547326029026c1c1df66dbc9a6c78c5",
"css": "paste",
"code": 59404,
"code": 59405,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -709,7 +709,7 @@
{
"uid": "4a5e561409988fe88a652bca5549dcfe",
"css": "close",
"code": 59405,
"code": 59406,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -723,7 +723,7 @@
{
"uid": "0cfc059176d702e1376af4e3b9b2ed64",
"css": "convert",
"code": 59406,
"code": 59407,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -779,7 +779,7 @@
{
"uid": "4221e439cbd906754d36dcf4f8c35c5d",
"css": "backspace",
"code": 59407,
"code": 59408,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -807,7 +807,7 @@
{
"uid": "6b7ef3aff4f46c09a952e34cad966375",
"css": "edit",
"code": 59408,
"code": 59409,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -863,7 +863,7 @@
{
"uid": "7ace7022b78490ee4a3bc44e51e06631",
"css": "envelope",
"code": 59409,
"code": 59410,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -891,7 +891,7 @@
{
"uid": "12cd0d0f954bdb71d3525ce890ab0be4",
"css": "gear",
"code": 59410,
"code": 59411,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -961,7 +961,7 @@
{
"uid": "b9e2d5e1423806fa9e5a763e0ef5faf6",
"css": "bridge",
"code": 59411,
"code": 59412,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -975,7 +975,7 @@
{
"uid": "5e30b1ae690a603113bb2936df830062",
"css": "claim-circle",
"code": 59412,
"code": 59413,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -1045,7 +1045,7 @@
{
"uid": "85bb0dd34def6f4840648af6709a4285",
"css": "donate-filled",
"code": 59413,
"code": 59414,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -1059,7 +1059,7 @@
{
"uid": "1694baf87238754d60da0e6ec08d40ff",
"css": "clock-filled",
"code": 59414,
"code": 59415,
"src": "custom_icons",
"selected": true,
"svg": {
Expand Down Expand Up @@ -1129,7 +1129,7 @@
{
"uid": "5631a467e6cbbabb985295cfe2773050",
"css": "donate-circle",
"code": 59415,
"code": 59416,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -1143,7 +1143,7 @@
{
"uid": "ee3a30b74bb3d853018a23f7db1c90ad",
"css": "clock",
"code": 59416,
"code": 59436,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -1154,20 +1154,6 @@
"clock"
]
},
{
"uid": "4bb96423a4e18d93e272e977afae277e",
"css": "success",
"code": 59441,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M1267 96A42 42 0 0 0 1207 96L490 814 156 480A42 42 0 0 0 96 480 42 42 0 0 0 96 540L459 904H459L459 904A42 42 0 0 0 489 916 42 42 0 0 0 519 904L1267 156A42 42 0 0 0 1267 96",
"width": 1363
},
"search": [
"success"
]
},
{
"uid": "c69f0d1657a9bf01a1edca9deb94d2ed",
"css": "time",
Expand Down Expand Up @@ -1213,7 +1199,7 @@
{
"uid": "abbe2593e171f18485ceed532bfeb524",
"css": "receive-filled",
"code": 59436,
"code": 59451,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -1227,7 +1213,7 @@
{
"uid": "a92c3ee7a38711615c35b580df59336d",
"css": "gooddapp",
"code": 59451,
"code": 59456,
"src": "custom_icons",
"selected": true,
"svg": {
Expand All @@ -1245,16 +1231,38 @@
"src": "fontawesome"
},
{
"uid": "a8ed7903f8f548da5a8084e1773f0bbb",
"css": "chat-1",
"code": 61501,
"src": "mfglabs"
"uid": "cbc328d1c779a2b9e3b1199d904199a5",
"css": "emo-grin",
"code": 59392,
"src": "fontelico"
},
{
"uid": "21f6a88daf13c62e5a70f5ef6ad9e23f",
"css": "chat",
"code": 59456,
"src": "websymbols"
"uid": "4bb96423a4e18d93e272e977afae277e",
"css": "success",
"code": 59441,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M1267 96A42 42 0 0 0 1207 96L490 814 156 480A42 42 0 0 0 96 480 42 42 0 0 0 96 540L459 904H459L459 904A42 42 0 0 0 489 916 42 42 0 0 0 519 904L1267 156A42 42 0 0 0 1267 96",
"width": 1363
},
"search": [
"success"
]
},
{
"uid": "1f0f6201cb7a4346af3872e8920d05a0",
"css": "paste2",
"code": 59458,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M391.4 63L396.6 63.3C339.6 54.2 279.6 96.3 281.7 159.3V181.5L282.1 176.6C278.8 200.8 283.3 225.3 295.8 246.7 308.3 268.2 330.7 286.5 359 291.4L360.9 291.7 362.7 291.8C408.1 294.6 451.8 292.4 493 293.1H494.2 495.4C525 291.5 563.8 298.8 607.7 287.2L609.4 286.7 611 286.2C637.3 276.4 655.1 254.6 663.2 233.2 670.6 213.7 671 194.7 669.8 176.9 672.5 153.6 668.7 129.9 656.6 109.3 644.1 87.9 621.7 69.5 593.4 64.6L591.1 64.3 588.9 64.2C521.8 61.4 455.7 63.7 391.4 63ZM385.4 133.9L387.9 134.3H390.6C455.8 135 519.7 133.1 581.9 135.5 587.7 136.7 591.4 139.2 595 145.3 598.7 151.6 600.6 161.5 599.5 169.6L599 173.7 599.3 177.8C600.4 188.9 599.2 200.6 596.4 207.8 593.9 214.3 591.8 216.3 587 218.3 563.7 223.8 532.2 220 494.1 221.6 450.9 220.9 409.6 222.7 370.4 220.5 364.6 219.3 361 216.9 357.4 210.8 353.7 204.4 351.7 194.4 352.9 186.3L353.1 183.9V157.6 157C352.7 143.1 370.5 131.5 385.4 133.9ZM416.7 678A35.7 35.7 0 0 0 381 713.7 35.7 35.7 0 0 0 416.7 749.4H674.6A35.7 35.7 0 0 0 710.3 713.7 35.7 35.7 0 0 0 674.6 678ZM416.7 400.2A35.7 35.7 0 0 0 381 435.9 35.7 35.7 0 0 0 416.7 471.6H674.6A35.7 35.7 0 0 0 710.3 435.9 35.7 35.7 0 0 0 674.6 400.2ZM277.8 678A35.7 35.7 0 0 0 242.1 713.7 35.7 35.7 0 0 0 277.8 749.4H297.6A35.7 35.7 0 0 0 333.3 713.7 35.7 35.7 0 0 0 297.6 678ZM277.8 400.2A35.7 35.7 0 0 0 242.1 435.9 35.7 35.7 0 0 0 277.8 471.6H297.6A35.7 35.7 0 0 0 333.3 435.9 35.7 35.7 0 0 0 297.6 400.2ZM277.8 539.2A35.7 35.7 0 0 0 242.1 574.9 35.7 35.7 0 0 0 277.8 610.6H297.6A35.7 35.7 0 0 0 333.3 574.9 35.7 35.7 0 0 0 297.6 539.2ZM416.7 539.2A35.7 35.7 0 0 0 381 574.9 35.7 35.7 0 0 0 416.7 610.6H674.6A35.7 35.7 0 0 0 710.3 574.9 35.7 35.7 0 0 0 674.6 539.2ZM316.8 142.4C277.9 143.2 233.7 141.6 187.9 154.1 121.7 169.6 89.8 233.5 87 289.9 80.4 393.4 84.4 495.4 83.3 595.4V596.1 596.7C85.1 667.3 75.9 745.5 95.7 826V826.2L95.8 826.3C104.5 860.4 127.8 886.1 154 901.6 180.3 917.1 209.8 924.1 238 925 343.5 930.4 447.8 927.1 550.5 928H551.2 551.8C619 926.2 695.1 936 773.1 913.7L773.3 913.6 773.7 913.5C809.9 902.4 834.9 875.1 848.5 846.4 862.1 817.6 866.7 787 867.2 759.3 870.7 632.6 868.4 506.5 869 381.4V380.4L869 379.4C866.3 328.3 879.6 249 824.9 188.8L823.8 187.6 822.5 186.5C763.8 133.2 687 144.8 636.6 142.4L633.3 213.7C692.2 216.5 742.9 213.1 772.7 238.7 799.1 269.3 794.5 322.1 797.6 382.9 797.6 383 797.6 383 797.6 383.1 797 508.7 799.2 633.7 795.8 757.6V757.8 758C795.4 778.1 791.5 799.9 784 815.7 776.6 831.3 767.8 840.4 752.9 845.1 693.2 862 624.1 854.6 550 856.6 445.6 855.7 342.4 858.9 241 853.7H240.6 240.3C222.8 853.1 204 848.2 190.4 840.1 176.8 832.1 168.7 822.5 165.1 808.7 149.4 744.6 156.7 672.1 154.8 595.1 154.8 595 154.8 595 154.8 594.9 155.8 492.8 152 392.3 158.3 294V293.7 293.4C159.9 260.5 177.3 229.6 204.3 223.4L205.1 223.2 205.9 223C238.3 214 276.6 214.6 318.2 213.8Z",
"width": 952
},
"search": [
"paste2"
]
}
]
}
Binary file modified src/assets/fonts/gooddollar.eot
View file
Open in desktop
Binary file not shown.
Loading
Loading