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

Fix/ios native browser issue #1462

Merged
merged 2 commits into from
Mar 19, 2024
Merged

Fix/ios native browser issue #1462

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
4ef2720
Resolved users NFT claiming issue
0xNilesh Mar 19, 2024
af0aefb
Resolved ios native browser text css issue
0xNilesh Mar 19, 2024
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
25 changes: 12 additions & 13 deletions src/config/Themization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const themeLight = {
secondaryColor: '#657795',
hover: '#F3F3FF',
borderColor: '#dfdee9',
primaryPushThemeTextColor: '#cf1c84'
primaryPushThemeTextColor: '#cf1c84',
},

// Login Theme
Expand Down Expand Up @@ -44,8 +44,8 @@ const themeLight = {
},

btn: {
disabledBg: "#E0E3E7",
disabledColor: "#BEC8D8"
disabledBg: '#E0E3E7',
disabledColor: '#BEC8D8',
},

// Default Background Theme
Expand Down Expand Up @@ -182,7 +182,7 @@ const themeLight = {

toastSuccessBackground: 'linear-gradient(90.15deg, #30CC8B -125.65%, #30CC8B -125.63%, #F3FFF9 42.81%)',
toastErrorBackground: 'linear-gradient(90.15deg, #FF2070 -125.65%, #FF2D79 -125.63%, #FFF9FB 42.81%)',
toastWarningBackground:'linear-gradient(90deg, #FFF2D1 0%, rgba(255, 255, 255, 0.00) 100%)',
toastWarningBackground: 'linear-gradient(90deg, #FFF2D1 0%, rgba(255, 255, 255, 0.00) 100%)',

// Profile
profileBG: 'linear-gradient(107deg, rgba(226,8,128,1) 30%, rgba(103,76,159,1) 70%, rgba(53,197,243,1) 100%)',
Expand Down Expand Up @@ -260,13 +260,13 @@ const themeLight = {
spaceHostTextColor: '#1e1e1e',

spaceTheme: {
titleBg: 'linear-gradient(45deg, #E165EC 0.01%, #A483ED 100%)',//not changed
titleBg: 'linear-gradient(45deg, #E165EC 0.01%, #A483ED 100%)', //not changed
titleTextColor: '#FFFFFF',
bgColorPrimary: 'red',
bgColorSecondary: '#F7F1FB',
textColorPrimary: '#000',
textColorSecondary: '#657795',
textGradient: 'linear-gradient(45deg, #B6A0F5, #F46EF6, #FFDED3, #FFCFC5)',//not changed
textGradient: 'linear-gradient(45deg, #B6A0F5, #F46EF6, #FFDED3, #FFCFC5)', //not changed
btnColorPrimary: '#D53A94',
btnOutline: '#D53A94',
borderColor: '#FFFF',
Expand Down Expand Up @@ -296,7 +296,7 @@ const themeLight = {

//collapsable sidebar
collapsaBg: '#575d737f',
strokeColor: '#FFF'
svgStrokeColor: '#FFF',
};

const themeDark = {
Expand All @@ -311,7 +311,7 @@ const themeDark = {
secondaryColor: '#B6BCD6',
hover: '#00000033',
borderColor: '#4A4F67',
primaryPushThemeTextColor: '#cf1c84'
primaryPushThemeTextColor: '#cf1c84',
},

// Login Theme
Expand Down Expand Up @@ -344,8 +344,8 @@ const themeDark = {
},

btn: {
disabledBg: "#383A40",
disabledColor: "#545F74"
disabledBg: '#383A40',
disabledColor: '#545F74',
},

// Header Theme
Expand Down Expand Up @@ -483,8 +483,7 @@ const themeDark = {
toastShadowColor: '#00000010',
toastSuccessBackground: 'linear-gradient(90.15deg, #30CC8B -125.65%, #30CC8B -125.63%, #2F3137 42.81%)',
toastErrorBackground: 'linear-gradient(89.96deg, #FF2070 -101.85%, #2F3137 51.33%)',
toastWarningBackground:'linear-gradient(90deg, #66562D 0.03%, #2F3137 74.67%)',

toastWarningBackground: 'linear-gradient(90deg, #66562D 0.03%, #2F3137 74.67%)',

//Profile
profileBG: '#2F3137',
Expand Down Expand Up @@ -601,7 +600,7 @@ const themeDark = {

//collapsable sidebar
collapsaBg: '#0000004c',
strokeColor: '#575D73'
svgStrokeColor: '#575D73',
};

module.exports = {
Expand Down
13 changes: 7 additions & 6 deletions src/helpers/AlphaAccessNftHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MerkleTree } from "merkletreejs";
import { ethers } from "ethers";
import { MerkleTree } from 'merkletreejs';
import { ethers } from 'ethers';

// Internal Configs
import whitelistAddressesList from 'config/alphaAccessNft/whitelist.json';
Expand All @@ -22,22 +22,23 @@ const AlphaAccessNFTHelper: AlphaAccessNFTHelper = {

async getProof(userWalletAddress: string): Promise<string[]> {
let proof: string[] = [];

if (whitelistAddressesList.includes(userWalletAddress)) {
const userAddress = userWalletAddress.toLowerCase();
if (whitelistAddressesList.includes(userAddress)) {
const { keccak256 } = ethers.utils;
let leaves = whitelistAddressesList.map((addr) => keccak256(addr));
const merkleTree = new MerkleTree(leaves, keccak256, { sortPairs: true });
let hashedAddress = keccak256(userWalletAddress);
let hashedAddress = keccak256(userAddress);
proof = merkleTree.getHexProof(hashedAddress);
}
return proof;
},

async verify(userWalletAddress: string): Promise<boolean> {
const { keccak256 } = ethers.utils;
const userAddress = userWalletAddress.toLowerCase();
let leaves = whitelistAddressesList.map((addr) => keccak256(addr));
const merkleTree = new MerkleTree(leaves, keccak256, { sortPairs: true });
let hashedAddress = keccak256(userWalletAddress);
let hashedAddress = keccak256(userAddress);
const merkleRootHash = merkleTree.getHexRoot();
let proof = merkleTree.getHexProof(hashedAddress);

Expand Down
Loading
Loading