Skip to content

Commit f6fb5e4

Browse files
nattb8nattb8
authored
Merge pull request #388 from immutable/refactor/marketplace
[DX-3550] refactor: marketplace package to use static functions for generating urls
2 parents 9f99e49 + 6bb7cce commit f6fb5e4

File tree

21 files changed

+244
-278
lines changed

21 files changed

+244
-278
lines changed

‎.github/workflows/update-version.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,25 @@ jobs:
9494
sed -i -E "s/[0-9]+\.[0-9]+\.[0-9]+/$NEW_VERSION/g" $FILE
9595
echo "Updated SDK version in SdkVersionInfoHelpers.cs to $NEW_VERSION"
9696
97-
- name: Ensure Passport Samples~/SamplesScenesScripts directory exists and clear contents
97+
- name: Ensure Samples~/SamplesScenesScripts directory exists and clear contents
9898
run: |
9999
mkdir -p ./src/Packages/Passport/Samples~/SamplesScenesScripts
100100
rm -rf ./src/Packages/Passport/Samples~/SamplesScenesScripts/*
101101
102+
mkdir -p ./src/Packages/Marketplace/Samples~/SamplesScenesScripts
103+
rm -rf ./src/Packages/Marketplace/Samples~/SamplesScenesScripts/*
104+
102105
- name: Install rsync
103106
run: sudo apt-get install -y rsync
104107

105108
- name: Copy sample scenes and scripts to Passport package Samples~
106109
id: copy_sample_scenes_and_scripts
107110
run: |
108-
rsync -av --exclude='*.meta' ./sample/Assets/Scenes/ ./src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/
109-
rsync -av --exclude='*.meta' ./sample/Assets/Scripts/ ./src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/
111+
rsync -av --exclude='*.meta' ./sample/Assets/Scenes/Passport ./src/Packages/Passport/Samples~/SamplesScenesScripts/Scenes/
112+
rsync -av --exclude='*.meta' ./sample/Assets/Scripts/Passport ./src/Packages/Passport/Samples~/SamplesScenesScripts/Scripts/
113+
114+
rsync -av --exclude='*.meta' ./sample/Assets/Scenes/Marketplace ./src/Packages/Marketplace/Samples~/SamplesScenesScripts/Scenes/
115+
rsync -av --exclude='*.meta' ./sample/Assets/Scripts/Marketplace ./src/Packages/Marketplace/Samples~/SamplesScenesScripts/Scripts/
110116
111117
- uses: gr2m/create-or-update-pull-request-action@v1
112118
env:

‎sample/Assets/Scenes/Marketplace/BridgeScene.unity

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1908,7 +1908,7 @@ MonoBehaviour:
19081908
m_HorizontalOverflow: 0
19091909
m_VerticalOverflow: 0
19101910
m_LineSpacing: 1
1911-
m_Text: sandbox
1911+
m_Text: Sandbox
19121912
--- !u!222 &827625658
19131913
CanvasRenderer:
19141914
m_ObjectHideFlags: 0
@@ -2892,7 +2892,7 @@ MonoBehaviour:
28922892
m_Script: {fileID: 11500000, guid: 89265f0596214bb5a23345888806c8de, type: 3}
28932893
m_Name:
28942894
m_EditorClassIdentifier:
2895-
Environment: {fileID: 1351870715}
2895+
EnvironmentDropdown: {fileID: 1351870715}
28962896
FromTokenAddress: {fileID: 949453541}
28972897
FromChain: {fileID: 1152654601}
28982898
ToTokenAddress: {fileID: 1363329117}
@@ -3301,9 +3301,9 @@ MonoBehaviour:
33013301
m_Value: 0
33023302
m_Options:
33033303
m_Options:
3304-
- m_Text: sandbox
3304+
- m_Text: Sandbox
33053305
m_Image: {fileID: 0}
3306-
- m_Text: production
3306+
- m_Text: Production
33073307
m_Image: {fileID: 0}
33083308
m_OnValueChanged:
33093309
m_PersistentCalls:

‎sample/Assets/Scenes/Marketplace/OnRampScene.unity

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1990,7 +1990,7 @@ MonoBehaviour:
19901990
m_HorizontalOverflow: 0
19911991
m_VerticalOverflow: 0
19921992
m_LineSpacing: 1
1993-
m_Text: sandbox
1993+
m_Text: Sandbox
19941994
--- !u!222 &827625658
19951995
CanvasRenderer:
19961996
m_ObjectHideFlags: 0
@@ -2887,7 +2887,7 @@ MonoBehaviour:
28872887
m_Script: {fileID: 11500000, guid: 90ea1df5aa4d54e4bbc702d843424073, type: 3}
28882888
m_Name:
28892889
m_EditorClassIdentifier:
2890-
Environment: {fileID: 1351870715}
2890+
EnvironmentDropdown: {fileID: 1351870715}
28912891
EmailInput: {fileID: 1142338628822901615}
28922892
AddressInput: {fileID: 1142338629240194742}
28932893
FiatCurrencyInput: {fileID: 949453541}
@@ -3298,9 +3298,9 @@ MonoBehaviour:
32983298
m_Value: 0
32993299
m_Options:
33003300
m_Options:
3301-
- m_Text: sandbox
3301+
- m_Text: Sandbox
33023302
m_Image: {fileID: 0}
3303-
- m_Text: production
3303+
- m_Text: Production
33043304
m_Image: {fileID: 0}
33053305
m_OnValueChanged:
33063306
m_PersistentCalls:

‎sample/Assets/Scenes/Marketplace/SwapScene.unity

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@ MonoBehaviour:
14741474
m_HorizontalOverflow: 0
14751475
m_VerticalOverflow: 0
14761476
m_LineSpacing: 1
1477-
m_Text: sandbox
1477+
m_Text: Sandbox
14781478
--- !u!222 &827625658
14791479
CanvasRenderer:
14801480
m_ObjectHideFlags: 0
@@ -2288,7 +2288,7 @@ MonoBehaviour:
22882288
m_Script: {fileID: 11500000, guid: 371b71184b3d4a72853fcb8fdb41383d, type: 3}
22892289
m_Name:
22902290
m_EditorClassIdentifier:
2291-
Environment: {fileID: 1351870715}
2291+
EnvironmentDropdown: {fileID: 1351870715}
22922292
KeyInput: {fileID: 1142338628822901615}
22932293
FromTokenAddress: {fileID: 949453541}
22942294
ToTokenAddress: {fileID: 1363329117}
@@ -2696,9 +2696,9 @@ MonoBehaviour:
26962696
m_Value: 0
26972697
m_Options:
26982698
m_Options:
2699-
- m_Text: sandbox
2699+
- m_Text: Sandbox
27002700
m_Image: {fileID: 0}
2701-
- m_Text: production
2701+
- m_Text: Production
27022702
m_Image: {fileID: 0}
27032703
m_OnValueChanged:
27042704
m_PersistentCalls:

‎sample/Assets/Scripts/Marketplace/BridgeScript.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1+
using System;
12
using AltWebSocketSharp;
2-
using Immutable.Marketplace.Bridge;
3-
using Immutable.Marketplace.OnRamp;
4-
using Immutable.Marketplace.Swap;
3+
using Immutable.Marketplace;
54
using UnityEngine;
65
using UnityEngine.SceneManagement;
76
using UnityEngine.UI;
7+
using Environment = Immutable.Marketplace.Environment;
88

99
public class BridgeScript : MonoBehaviour
1010
{
11-
[SerializeField] private Dropdown Environment;
11+
[SerializeField] private Dropdown EnvironmentDropdown;
1212

1313
[SerializeField] private InputField FromTokenAddress;
1414
[SerializeField] private InputField FromChain;
1515
[SerializeField] private InputField ToTokenAddress;
1616
[SerializeField] private InputField ToChain;
17-
17+
1818
[SerializeField] private Button OpenButton;
1919

2020
/// <summary>
2121
/// Opens the bridge widget with specified inputs, defaulting to pre-set values when fields are empty.
2222
/// </summary>
2323
public void OpenWidget()
2424
{
25-
var environment = Environment.options[Environment.value].text;
26-
27-
var bridge = new Bridge(environment);
25+
var environments = (Environment[])Enum.GetValues(typeof(Environment));
26+
var environment = environments[EnvironmentDropdown.value];
2827

29-
var link = bridge.GetLink(
28+
var link = LinkFactory.GenerateBridgeLink(
29+
environment: environment,
3030
fromTokenAddress: FromTokenAddress.text.IsNullOrEmpty() ? null : FromTokenAddress.text,
31-
fromChain: FromChain.text.IsNullOrEmpty() ? null : FromChain.text,
31+
fromChainID: FromChain.text.IsNullOrEmpty() ? null : FromChain.text,
3232
toTokenAddress: ToTokenAddress.text.IsNullOrEmpty() ? null : ToTokenAddress.text,
33-
toChain: ToChain.text.IsNullOrEmpty() ? null : ToChain.text
33+
toChainID: ToChain.text.IsNullOrEmpty() ? null : ToChain.text
3434
);
3535

3636
Application.OpenURL(link);

‎sample/Assets/Scripts/Marketplace/MarketplaceScript.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ public void OnRamp()
77
{
88
SceneManager.LoadScene("OnRampScene");
99
}
10-
10+
1111
public void Swap()
1212
{
1313
SceneManager.LoadScene("SwapScene");
1414
}
15-
15+
1616
public void Bridge()
1717
{
1818
SceneManager.LoadScene("BridgeScene");

‎sample/Assets/Scripts/Marketplace/OnRampScript.cs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1+
using System;
12
using AltWebSocketSharp;
2-
using Immutable.Marketplace.OnRamp;
3+
using Immutable.Marketplace;
34
using UnityEngine;
45
using UnityEngine.SceneManagement;
56
using UnityEngine.UI;
7+
using Environment = Immutable.Marketplace.Environment;
68

79
public class OnRampScript : MonoBehaviour
810
{
9-
[SerializeField] private Dropdown Environment;
11+
[SerializeField] private Dropdown EnvironmentDropdown;
1012
[SerializeField] private InputField EmailInput;
1113
[SerializeField] private InputField AddressInput;
1214

1315
[SerializeField] private InputField FiatCurrencyInput;
1416
[SerializeField] private InputField FiatAmountInput;
1517
[SerializeField] private InputField CryptoCurrency;
1618
[SerializeField] private InputField CryptoCurrencyList;
17-
19+
1820
[SerializeField] private Button OpenButton;
1921

2022
private void Start()
@@ -39,13 +41,15 @@ private void ValidateInputFields()
3941
/// </summary>
4042
public void OpenWidget()
4143
{
42-
var environment = Environment.options[Environment.value].text;
44+
var environments = (Environment[])Enum.GetValues(typeof(Environment));
45+
var environment = environments[EnvironmentDropdown.value];
4346
var email = EmailInput.text;
4447
var walletAddress = AddressInput.text;
4548

46-
var onRamp = new OnRamp(environment, email, walletAddress);
47-
48-
var link = onRamp.GetLink(
49+
var link = LinkFactory.GenerateOnRampLink(
50+
environment: environment,
51+
email: email,
52+
address: walletAddress,
4953
fiatCurrency: FiatCurrencyInput.text.IsNullOrEmpty() ? "USD" : FiatCurrencyInput.text,
5054
fiatAmount: FiatAmountInput.text.IsNullOrEmpty() ? "50" : FiatAmountInput.text,
5155
cryptoCurrency: CryptoCurrency.text.IsNullOrEmpty() ? "IMX" : CryptoCurrency.text,
@@ -54,7 +58,7 @@ public void OpenWidget()
5458

5559
Application.OpenURL(link);
5660
}
57-
61+
5862
/// <summary>
5963
/// Returns to the marketplace scene.
6064
/// </summary>

‎sample/Assets/Scripts/Marketplace/SwapScript.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1+
using System;
12
using AltWebSocketSharp;
2-
using Immutable.Marketplace.OnRamp;
3-
using Immutable.Marketplace.Swap;
3+
using Immutable.Marketplace;
44
using UnityEngine;
55
using UnityEngine.SceneManagement;
66
using UnityEngine.UI;
7+
using Environment = Immutable.Marketplace.Environment;
78

89
public class SwapScript : MonoBehaviour
910
{
10-
[SerializeField] private Dropdown Environment;
11+
[SerializeField] private Dropdown EnvironmentDropdown;
1112
[SerializeField] private InputField KeyInput;
1213

1314
[SerializeField] private InputField FromTokenAddress;
1415
[SerializeField] private InputField ToTokenAddress;
15-
16+
1617
[SerializeField] private Button OpenButton;
1718

1819
private void Start()
@@ -36,12 +37,13 @@ private void ValidateInputFields()
3637
/// </summary>
3738
public void OpenWidget()
3839
{
39-
var environment = Environment.options[Environment.value].text;
40+
var environments = (Environment[])Enum.GetValues(typeof(Environment));
41+
var environment = environments[EnvironmentDropdown.value];
4042
var publishableKey = KeyInput.text;
4143

42-
var swap = new Swap(environment, publishableKey);
43-
44-
var link = swap.GetLink(
44+
var link = LinkFactory.GenerateSwapLink(
45+
environment: environment,
46+
publishableKey: publishableKey,
4547
fromTokenAddress: FromTokenAddress.text.IsNullOrEmpty() ? null : FromTokenAddress.text,
4648
toTokenAddress: ToTokenAddress.text.IsNullOrEmpty() ? null : ToTokenAddress.text
4749
);

‎src/Packages/Marketplace/Runtime/Bridge.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/Packages/Marketplace/Runtime/Bridge/Bridge.cs

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎src/Packages/Marketplace/Runtime/Bridge/Bridge.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)