Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/main' into pay-1624-buy-track-modal
Browse files Browse the repository at this point in the history
* origin/main:
  [C-801] Fix oauth nodes (#3807)
  Update typography component to use classnames (#3805)
  Switch to Stripe package instead of script (#3798)
  [C-2890] Add first version of a typography component to web (#3796)
  Fix mobile prem-content drawer unlocking margin (#3804)
  [C-2857] Remove get blocknumber (#3802)
  Prepare for 1.5.34 full app release (#3801)
  • Loading branch information
schottra committed Jul 27, 2023
2 parents 967ffd4 + 039c951 commit 6dca780
Show file tree
Hide file tree
Showing 22 changed files with 363 additions and 294 deletions.
6 changes: 1 addition & 5 deletions packages/common/src/services/audius-backend/AudiusBackend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1317,12 +1317,8 @@ export const audiusBackend = ({
if (isAlbum) isPrivate = false

try {
const web3 = await audiusLibs.web3Manager.getWeb3()
const currentBlockNumber = await web3.eth.getBlockNumber()
const currentBlock = await web3.eth.getBlock(currentBlockNumber)
const playlistTracks = trackIds.map((trackId) => ({
track: trackId,
metadata_time: currentBlock.timestamp
track: trackId
}))
const response = await audiusLibs.EntityManager.createPlaylist({
...metadata,
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ android {
// versionCode is automatically incremented in CI
versionCode 1
// Make sure this is above the currently released Android version in the play store if your changes touch native code:
versionName "1.1.393"
versionName "1.1.394"
resValue "string", "build_config_package", "co.audius.app"
resValue 'string', "CODE_PUSH_APK_BUILD_TIME", String.format("\"%d\"", System.currentTimeMillis())
resConfigs "en"
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/ios/AudiusReactNative/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.68</string>
<string>1.1.69</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ const useStyles = makeStyles(({ palette, spacing, typography }) => ({
borderWidth: 1,
borderColor: palette.neutralLight7,
borderRadius: spacing(2),
gap: spacing(2)
gap: spacing(2),
width: '100%'
},
titleContainer: {
...flexRowCentered(),
Expand Down
Loading

0 comments on commit 6dca780

Please sign in to comment.