Skip to content

Commit 8fab595

Browse files
authored
New Connect Wallet Button + Various UI cleanups, improvements and bugfixes (#134)
1 parent c10df01 commit 8fab595

File tree

68 files changed

+127114
-121224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+127114
-121224
lines changed

Assets/Thirdweb/Core/Scripts/Marketplace.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public async Task<TransactionResult> CreateListing(CreateListingInput input)
278278
TokenId = BigInteger.Parse(input.tokenId),
279279
Quantity = BigInteger.Parse(input.quantity ?? "1"),
280280
Currency = input.currencyContractAddress ?? Utils.NativeTokenAddress,
281-
PricePerToken = BigInteger.Parse(input.pricePerToken),
281+
PricePerToken = BigInteger.Parse(input.pricePerToken.ToWei()),
282282
StartTimestamp = input.startTimestamp ?? await Blocks.GetLatestBlockTimestamp() + 60,
283283
EndTimestamp = (BigInteger)(input.endTimestamp ?? Utils.GetUnixTimeStampNow() + 60 * 60 * 24 * 7),
284284
Reserved = input.isReservedListing ?? false,

Assets/Thirdweb/Core/Scripts/ThirdwebSession.cs

+9-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,15 @@ internal async Task<string> Connect(WalletConnection walletConnection)
6363
ActiveWallet = new ThirdwebMetamask();
6464
break;
6565
case WalletProvider.SmartWallet:
66-
await Connect(new WalletConnection(walletConnection.personalWallet, walletConnection.chainId, walletConnection.password, walletConnection.email));
66+
await Connect(
67+
new WalletConnection(
68+
provider: walletConnection.personalWallet,
69+
chainId: walletConnection.chainId,
70+
password: walletConnection.password,
71+
email: walletConnection.email,
72+
authOptions: walletConnection.authOptions
73+
)
74+
);
6775
if (Options.smartWalletConfig == null)
6876
throw new UnityException("Smart wallet config is required for smart wallet connection method!");
6977
ActiveWallet = new ThirdwebSmartWallet(ActiveWallet, Options.smartWalletConfig.Value);

Assets/Thirdweb/Examples/Prefabs/Button_Network.prefab

+2-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ RectTransform:
3131
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 8638174079634783163}
34-
m_RootOrder: 1
3534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3635
m_AnchorMin: {x: 0, y: 0.5}
3736
m_AnchorMax: {x: 0, y: 0.5}
@@ -66,7 +65,7 @@ MonoBehaviour:
6665
m_OnCullStateChanged:
6766
m_PersistentCalls:
6867
m_Calls: []
69-
m_text: Browser Wallet
68+
m_text: Label
7069
m_isRightToLeft: 0
7170
m_fontAsset: {fileID: 11400000, guid: 078675f65f8a9144e90348ab75bb07e7, type: 2}
7271
m_sharedMaterial: {fileID: -6451935136126618428, guid: 078675f65f8a9144e90348ab75bb07e7, type: 2}
@@ -169,7 +168,6 @@ RectTransform:
169168
- {fileID: 4333239320545370275}
170169
- {fileID: 1078745100172470259}
171170
m_Father: {fileID: 0}
172-
m_RootOrder: 0
173171
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
174172
m_AnchorMin: {x: 0, y: 0}
175173
m_AnchorMax: {x: 0, y: 0}
@@ -289,7 +287,6 @@ RectTransform:
289287
m_ConstrainProportionsScale: 0
290288
m_Children: []
291289
m_Father: {fileID: 8638174079634783163}
292-
m_RootOrder: 0
293290
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
294291
m_AnchorMin: {x: 0, y: 0.5}
295292
m_AnchorMax: {x: 0, y: 0.5}
@@ -324,7 +321,7 @@ MonoBehaviour:
324321
m_OnCullStateChanged:
325322
m_PersistentCalls:
326323
m_Calls: []
327-
m_Sprite: {fileID: 21300000, guid: 217680bfb64fc074392309113986a3ee, type: 3}
324+
m_Sprite: {fileID: 21300000, guid: bf76ffa047029554199b8d79b2306f6d, type: 3}
328325
m_Type: 0
329326
m_PreserveAspect: 1
330327
m_FillCenter: 1

0 commit comments

Comments
 (0)